From c628c0ebb26fe0c1bf8f9d87b8e0cab9ba71a714 Mon Sep 17 00:00:00 2001 From: Chopper Date: Mon, 28 Jun 2021 14:56:34 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E5=BA=97=E9=93=BA=E5=85=A5=E9=A9=BB?= =?UTF-8?q?=E5=AD=97=E6=AE=B5=E7=BC=BA=E5=A4=B1=E9=97=AE=E9=A2=98=E5=A4=84?= =?UTF-8?q?=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../lili/modules/store/mapper/StoreDetailMapper.java | 2 +- .../modules/store/serviceimpl/StoreServiceImpl.java | 10 ++++++++-- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/framework/src/main/java/cn/lili/modules/store/mapper/StoreDetailMapper.java b/framework/src/main/java/cn/lili/modules/store/mapper/StoreDetailMapper.java index 0c33996b..4253411e 100644 --- a/framework/src/main/java/cn/lili/modules/store/mapper/StoreDetailMapper.java +++ b/framework/src/main/java/cn/lili/modules/store/mapper/StoreDetailMapper.java @@ -24,7 +24,7 @@ public interface StoreDetailMapper extends BaseMapper { "d.* from li_store s inner join li_store_detail d on s.id=d.store_id where s.id=#{storeId}") StoreDetailVO getStoreDetail(String storeId); - @Select("select s.member_name,s.store_name,s.store_disable,s.self_operated,s.store_center,s.store_logo,s.store_desc,d.* " + + @Select("select s.member_name,s.store_name,s.store_disable,s.self_operated,s.store_center,s.store_logo,s.store_desc,s.store_address_detail,s.store_address_path,s.store_address_id_path,d.* " + "from li_store s inner join li_store_detail d on s.id=d.store_id where s.member_id=#{memberId}") StoreDetailVO getStoreDetailByMemberId(String memberId); diff --git a/framework/src/main/java/cn/lili/modules/store/serviceimpl/StoreServiceImpl.java b/framework/src/main/java/cn/lili/modules/store/serviceimpl/StoreServiceImpl.java index c6706df1..3900662a 100644 --- a/framework/src/main/java/cn/lili/modules/store/serviceimpl/StoreServiceImpl.java +++ b/framework/src/main/java/cn/lili/modules/store/serviceimpl/StoreServiceImpl.java @@ -179,8 +179,8 @@ public class StoreServiceImpl extends ServiceImpl implements memberService.updateById(member); //设定商家的结算日 storeDetailService.update(new LambdaUpdateWrapper() - .eq(StoreDetail::getStoreId,id) - .set(StoreDetail::getSettlementDay,new DateTime())); + .eq(StoreDetail::getStoreId, id) + .set(StoreDetail::getSettlementDay, new DateTime())); } else { store.setStoreDisable(StoreStatusEnum.REFUSED.value()); } @@ -220,11 +220,17 @@ public class StoreServiceImpl extends ServiceImpl implements if (!Optional.ofNullable(store).isPresent()) { Member member = memberService.getById(UserContext.getCurrentUser().getId()); store = new Store(member); + BeanUtil.copyProperties(storeCompanyDTO, store); this.save(store); StoreDetail storeDetail = new StoreDetail(); storeDetail.setStoreId(store.getId()); BeanUtil.copyProperties(storeCompanyDTO, storeDetail); return storeDetailService.save(storeDetail); + } else { + store.setStoreAddressDetail(storeCompanyDTO.getStoreAddressDetail()); + store.setStoreAddressIdPath(storeCompanyDTO.getStoreAddressIdPath()); + store.setStoreAddressPath(storeCompanyDTO.getStoreAddressPath()); + this.saveOrUpdate(store); } //判断是否存在店铺详情，如果没有则进行新建，如果存在则进行修改 StoreDetail storeDetail = storeDetailService.getStoreDetail(store.getId()); From cf9e6a659a371a9812a9b392eb2ba973fa73ef3c Mon Sep 17 00:00:00 2001 From: Chopper Date: Mon, 28 Jun 2021 15:16:32 +0800 Subject: [PATCH 2/2] =?UTF-8?q?qq=E8=81=94=E5=90=88=E7=99=BB=E5=BD=95openi?= =?UTF-8?q?d=E9=97=AE=E9=A2=98=E5=A4=84=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/lili/modules/connect/util/ConnectUtil.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/framework/src/main/java/cn/lili/modules/connect/util/ConnectUtil.java b/framework/src/main/java/cn/lili/modules/connect/util/ConnectUtil.java index cf28840a..acf388a3 100644 --- a/framework/src/main/java/cn/lili/modules/connect/util/ConnectUtil.java +++ b/framework/src/main/java/cn/lili/modules/connect/util/ConnectUtil.java @@ -184,6 +184,8 @@ public class ConnectUtil { .clientId(qqConnectSettingItem.getAppId()) .clientSecret(qqConnectSettingItem.getAppKey()) .redirectUri(getRedirectUri(authInterface)) + //这里qq获取unionid 需要配置为true，详情可以查阅属性说明，内部有帮助文档 + .unionId(true) .build(), cache); } }