diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/mem/WxLevelConfigController.java b/mallinkAdmin/src/main/java/com/iformall/controller/mem/WxLevelConfigController.java index 3299d65e4..7dafae748 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/mem/WxLevelConfigController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/mem/WxLevelConfigController.java @@ -64,7 +64,6 @@ public class WxLevelConfigController extends BaseController { public ResultData add(@RequestBody List levelConfigs) { logger.debug("[" + getIpAddr() + "] WxLevelConfigController::add"); try { - if (StringUtils.isNotBlank(ifParentUpdateTenantInfo().getParentTenantId())) { return new ResultData(ErrorCode.USER_NO_PERMISSION.getCode(), "广场用户无此权限"); } @@ -98,7 +97,7 @@ public class WxLevelConfigController extends BaseController { @SystemControllerLog(description = "会员等级权益-删除") public ResultData delete(@RequestBody WxLevelConfig wxLevelConfig) { logger.debug("[" + getIpAddr() + "] WxLevelConfigController::delete"); - if (StringUtils.isNotBlank(getTenantInfo().getParentTenantId())) { + if (StringUtils.isNotBlank(ifParentUpdateTenantInfo().getParentTenantId())) { return new ResultData(ErrorCode.USER_NO_PERMISSION.getCode(), "广场用户无此权限"); } wxLevelConfigService.deleteById(wxLevelConfig.getId()); 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 b62e780d7..2dbbdf520 100644 --- a/mallinkService/src/main/resources/mapper/WxCUserBasicInfoMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxCUserBasicInfoMapper.xml @@ -146,10 +146,10 @@ - and wcu.`tenant_id` = #{tenantId} + and wcu.`tenant_id` = #{tenantInfo.tenantId} - and wcu.`parent_tenant_id` = #{parentTenantId} + and wcu.`parent_tenant_id` = #{tenantInfo.parentTenantId} @@ -203,7 +203,7 @@ and wcubi.`name` like concat('%', #{basicInfo.name},'%') - + and wcubi.`create_date` between #{basicInfo.startTime} and #{basicInfo.endTime} @@ -537,7 +537,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 @@ -554,7 +553,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} @@ -613,10 +611,10 @@ and wcu.`parent_tenant_id` = #{tenantInfo.parentTenantId} - and wcubi.create_date >= #{startTime} + and wcubi.create_date >= #{basicInfo.startTime} - and wcubi.create_date < #{endTime} + and wcubi.create_date < #{basicInfo.endTime} group by wcubi.reportTime diff --git a/mallinkService/src/main/resources/mapper/WxLevelConfigMapper.xml b/mallinkService/src/main/resources/mapper/WxLevelConfigMapper.xml index 3655d41c1..97d38b187 100644 --- a/mallinkService/src/main/resources/mapper/WxLevelConfigMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxLevelConfigMapper.xml @@ -28,9 +28,6 @@ and wlc.`tenant_id` = #{tenantId} - - and wm.`parent_tenant_id` = #{parentTenantId} - and wlc.`points` = #{points} @@ -70,7 +67,6 @@ select from wx_level_config wlc - left join wx_mall wm on wm.tenant_id = wlc.tenant_id