From dbe33877fada7aa6719776852c476ffa86614362 Mon Sep 17 00:00:00 2001 From: xhxu Date: Tue, 11 Aug 2020 14:00:12 +0800 Subject: [PATCH] login --- .../com/iformall/controller/WxUserGrantController.java | 7 ++++++- .../src/main/java/com/iformall/domain/po/WxMall.java | 3 +++ .../src/main/resources/mapper/WxCUserBasicInfoMapper.xml | 4 +--- 3 files changed, 10 insertions(+), 4 deletions(-) diff --git a/mallinkCApi/src/main/java/com/iformall/controller/WxUserGrantController.java b/mallinkCApi/src/main/java/com/iformall/controller/WxUserGrantController.java index e772490f1..b67e7c8af 100755 --- a/mallinkCApi/src/main/java/com/iformall/controller/WxUserGrantController.java +++ b/mallinkCApi/src/main/java/com/iformall/controller/WxUserGrantController.java @@ -175,10 +175,15 @@ public class WxUserGrantController extends BaseController { List mallList = null; if(StringUtils.isNotBlank(wxMall.getParentTenantId())){ mallList = mallService.getSubByParentTenantId(wxMall.getParentTenantId()); - resultMap.put("subMalls", JSON.toJSONString(mallList)); } if (wxAuthorizerInfo.getGroupSupport().equals(EnumGroupSupport.SUPPORT.getCode())) { mallList = mallService.getSubByParentTenantId(wxMall.getTenantId()); + } + if(mallList != null && mallList.size() >0){ + mallList.stream().forEach(cs -> { + WxAppinfo cAppInfo = wxAppinfoService.getCAppInfo(cs.getTenantInfo(), EnumPayWay.PAY_WAY_WECHAT); + cs.setAppId(cAppInfo.getAppId()); + }); resultMap.put("subMalls", JSON.toJSONString(mallList)); } diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxMall.java b/mallinkService/src/main/java/com/iformall/domain/po/WxMall.java index 5f47b3579..a7a112a63 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxMall.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxMall.java @@ -92,6 +92,9 @@ public class WxMall extends BaseEntity { @TableField(exist = false) protected List buildings; + @TableField(exist = false) + private String appId; + @TableField(exist = false) private boolean valid; diff --git a/mallinkService/src/main/resources/mapper/WxCUserBasicInfoMapper.xml b/mallinkService/src/main/resources/mapper/WxCUserBasicInfoMapper.xml index d12e56a43..28778a7a3 100644 --- a/mallinkService/src/main/resources/mapper/WxCUserBasicInfoMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxCUserBasicInfoMapper.xml @@ -198,7 +198,7 @@ and wcubi.`name` like concat('%', #{basicInfo.name},'%') - + and wcubi.`create_date` between #{basicInfo.startTime} and #{basicInfo.endTime} @@ -532,7 +532,6 @@ (select count(distinct wcubi.id) from wx_c_user_basic_info wcubi - left join wx_c_user wcu on wcu.user_id = wcubi.id where 1=1 date_format(wcubi.create_date, '%Y-%m-%d') <= reportTime @@ -549,7 +548,6 @@ ) as totalCount from wx_c_user_basic_info wcubi - left join wx_c_user wcu on wcu.user_id = wcubi.id where 1=1 and wcubi.`final_tenant_id` = #{finalTenantId}