From 8ddcfa63084e2d5126d864e7f117db7fdd79958d Mon Sep 17 00:00:00 2001 From: xhxu Date: Fri, 4 Mar 2022 17:46:24 +0800 Subject: [PATCH] =?UTF-8?q?/.=20=E6=8A=A5=E8=A1=A8-001.1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../iformall/controller/basic/WxMallController.java | 3 +-- .../controller/basic/WxProjectConfigController.java | 10 ++-------- .../controller/mem/WxScoreRulesController.java | 8 ++------ .../com/iformall/controller/WxMallController.java | 2 +- .../iformall/controller/WxUserGrantController.java | 2 +- .../com/iformall/service/WxCUserBasicInfoService.java | 4 ++-- .../iformall/service/impl/DataTowerServiceImpl.java | 5 ++++- .../service/impl/WxCUserBasicInfoServiceImpl.java | 9 ++++++--- .../iformall/service/impl/WxUserVisitServiceImpl.java | 11 +++++++---- 9 files changed, 26 insertions(+), 28 deletions(-) diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/basic/WxMallController.java b/mallinkAdmin/src/main/java/com/iformall/controller/basic/WxMallController.java index 42e25ae1f..67a6ac3a9 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/basic/WxMallController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/basic/WxMallController.java @@ -59,8 +59,7 @@ public class WxMallController extends BaseController { logger.error("未配置相应的mall"); return new ResultData(Result.ERROR, "未配置相应的mall"); } - if (mall.getGroupSupport().equals(EnumGroupSupport.SUPPORT.getCode()) && - StringUtils.isBlank(mall.getParentTenantId())) { + if (wxMallService.isgroupSupport(mall)) { mall.setSubMalls(wxMallService.getSubByParentTenantId(mall.getTenantId())); } mall.setValidPrompt(wxMallService.mallValid(getUserId(),mall)); diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/basic/WxProjectConfigController.java b/mallinkAdmin/src/main/java/com/iformall/controller/basic/WxProjectConfigController.java index 9e036203b..6c153aab8 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/basic/WxProjectConfigController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/basic/WxProjectConfigController.java @@ -684,10 +684,7 @@ public class WxProjectConfigController extends BaseController { // } TenantEntity tenantEntity = new TenantEntity(); tenantEntity.setTenantId(tenantId); - WxMall parentWxMall = wxMallService.getByTenantInfo(tenantEntity); - if(parentWxMall == null || parentWxMall.getSaleType() != 100 - || !parentWxMall.getGroupSupport().equals(EnumGroupSupport.SUPPORT.getCode()) - || StringUtils.isNotBlank(parentWxMall.getParentTenantId())){ + if(!wxMallService.isgroupSupport(tenantEntity)){ return new ResultData(ErrorCode.SYS_PARAMETER_ERROR); } wxProjectConfigService.initSubmall(tenantId,subTenantIds); @@ -721,10 +718,7 @@ public class WxProjectConfigController extends BaseController { TenantEntity tenantEntity = new TenantEntity(); tenantEntity.setTenantId(tenantId); - WxMall parentWxMall = wxMallService.getByTenantInfo(tenantEntity); - if(parentWxMall == null || parentWxMall.getSaleType() != 100 - || !parentWxMall.getGroupSupport().equals(EnumGroupSupport.SUPPORT.getCode()) - || StringUtils.isNotBlank(parentWxMall.getParentTenantId())){ + if(!wxMallService.isgroupSupport(tenantEntity)){ return new ResultData(ErrorCode.SYS_PARAMETER_ERROR); } StringBuilder sb = new StringBuilder(); diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/mem/WxScoreRulesController.java b/mallinkAdmin/src/main/java/com/iformall/controller/mem/WxScoreRulesController.java index a3ac9567d..db6bc7be6 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/mem/WxScoreRulesController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/mem/WxScoreRulesController.java @@ -58,9 +58,7 @@ public class WxScoreRulesController extends BaseController { wxScoreRules.updateTenantInfo(tenantEntity); }else if(wxScoreRules.getType().equals(EnumScoreRules.CREDIT_DOUBLE.getCode())){ TenantEntity tenantEntity = getTenantInfo(); - WxMall mall = wxMallService.getByTenantId(getUser().getTenantId()); - if(mall.getGroupSupport().equals(EnumGroupSupport.SUPPORT.getCode()) - && StringUtils.isBlank(mall.getParentTenantId())){ + if(wxMallService.isgroupSupport(tenantEntity)){ return new ResultData(ErrorCode.USER_NO_PERMISSION.getCode(), "集团用户无此权限"); } wxScoreRules.updateTenantInfo(tenantEntity); @@ -88,9 +86,7 @@ public class WxScoreRulesController extends BaseController { @SystemControllerLog(description = "积分-配置") public ResultData creditDoubleRulesList() { logger.debug("[" + getIpAddr() + "] creditDoubleRulesList::list"); - WxMall mall = wxMallService.getByTenantId(getUser().getTenantId()); - if(mall.getGroupSupport().equals(EnumGroupSupport.SUPPORT.getCode()) - && StringUtils.isBlank(mall.getParentTenantId())){ + if(wxMallService.isgroupSupport(getUser())){ return new ResultData(ErrorCode.USER_NO_PERMISSION.getCode(), "集团用户无此权限"); } WxScoreRules scoreRules = wxScoreRulesService.getCreditDoubleRules(getTenantInfo().getTenantId()); diff --git a/mallinkBApi/src/main/java/com/iformall/controller/WxMallController.java b/mallinkBApi/src/main/java/com/iformall/controller/WxMallController.java index a83e56aeb..e9da433f9 100644 --- a/mallinkBApi/src/main/java/com/iformall/controller/WxMallController.java +++ b/mallinkBApi/src/main/java/com/iformall/controller/WxMallController.java @@ -74,7 +74,7 @@ public class WxMallController extends BaseController { if (mall == null) { return new ResultData(ErrorCode.MALL_INFO_NOT_FOUND); } - if (mall.getGroupSupport().equals(EnumGroupSupport.SUPPORT.getCode())) { + if (wxMallService.isgroupSupport(mall)) { List mallList = wxMallService.getSubByParentTenantId(mall.getTenantId()); mall.setSubMalls(mallList); } diff --git a/mallinkCApi/src/main/java/com/iformall/controller/WxUserGrantController.java b/mallinkCApi/src/main/java/com/iformall/controller/WxUserGrantController.java index 18d7a8673..e46eaf8d6 100755 --- a/mallinkCApi/src/main/java/com/iformall/controller/WxUserGrantController.java +++ b/mallinkCApi/src/main/java/com/iformall/controller/WxUserGrantController.java @@ -206,7 +206,7 @@ public class WxUserGrantController extends BaseController { if(StringUtils.isNotBlank(wxMall.getParentTenantId())){ mallList = mallService.getSubByParentTenantId(wxMall.getParentTenantId()); } - if (wxMall.getGroupSupport().equals(EnumGroupSupport.SUPPORT.getCode())) { + if (mallService.isgroupSupport(wxMall)) { mallList = mallService.getSubByParentTenantId(wxMall.getTenantId()); } if(mallList != null && mallList.size() >0){ diff --git a/mallinkService/src/main/java/com/iformall/service/WxCUserBasicInfoService.java b/mallinkService/src/main/java/com/iformall/service/WxCUserBasicInfoService.java index b9a61cd45..dc405c054 100644 --- a/mallinkService/src/main/java/com/iformall/service/WxCUserBasicInfoService.java +++ b/mallinkService/src/main/java/com/iformall/service/WxCUserBasicInfoService.java @@ -134,9 +134,9 @@ public interface WxCUserBasicInfoService { void importOneMem(String importKey, List tagList, CUserBaseInfoT uBase,MallUserInfo mallUserInfo); - long findCount(WxCUserBasicInfoDto dto); + long findCount(WxCUserBasicInfoDto record); - List findCountHistory(WxCUserBasicInfoDto dto); + List findCountHistory(WxCUserBasicInfoDto record); /** * 停车会员记录导出 * @param record diff --git a/mallinkService/src/main/java/com/iformall/service/impl/DataTowerServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/DataTowerServiceImpl.java index 2865fa638..e63b4475c 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/DataTowerServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/DataTowerServiceImpl.java @@ -202,7 +202,10 @@ public class DataTowerServiceImpl implements DataTowerService { String date = DateUtils.getTimeBefore(1, new Date()); chartDataQ.setQuerytime(DateUtils.stringToDate(date)); List list = wxChartDataMapper.findList(chartDataQ); - Integer carCount = list.stream().map(e -> Integer.parseInt(e.getResult())).reduce(Integer::sum).get(); + int carCount = 0; + if(list != null && list.size() > 0){ + carCount = list.stream().map(e -> Integer.parseInt(e.getResult())).reduce(Integer::sum).get(); + } HashMap carMap = new HashMap<>(); carMap.put("carCount",carCount); diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxCUserBasicInfoServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxCUserBasicInfoServiceImpl.java index 6bacd6fa9..ccbf4bbc6 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxCUserBasicInfoServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxCUserBasicInfoServiceImpl.java @@ -22,6 +22,7 @@ import org.apache.commons.compress.utils.Lists; import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import org.springframework.beans.BeanUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.data.redis.core.StringRedisTemplate; import org.springframework.stereotype.Service; @@ -1173,7 +1174,9 @@ public class WxCUserBasicInfoServiceImpl implements WxCUserBasicInfoService,IExc } @Override - public long findCount(WxCUserBasicInfoDto dto) { + public long findCount(WxCUserBasicInfoDto record) { + WxCUserBasicInfoDto dto = new WxCUserBasicInfoDto(); + BeanUtils.copyProperties(record,dto); if(wxMallService.isgroupSupport(dto)){ dto.setParentTenantId(dto.getTenantId()); dto.setTenantId(null); @@ -1182,8 +1185,8 @@ public class WxCUserBasicInfoServiceImpl implements WxCUserBasicInfoService,IExc } @Override - public List findCountHistory(WxCUserBasicInfoDto dto) { - return wxCUserBasicInfoMapper.findCountHistory(dto); + public List findCountHistory(WxCUserBasicInfoDto record) { + return wxCUserBasicInfoMapper.findCountHistory(record); } @Override diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxUserVisitServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxUserVisitServiceImpl.java index b91342f99..26804a6a8 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxUserVisitServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxUserVisitServiceImpl.java @@ -11,6 +11,7 @@ import com.iformall.service.WxMallService; import com.iformall.service.WxUserVisitService; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import org.springframework.beans.BeanUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import com.iformall.common.IdWorker; @@ -65,10 +66,12 @@ public class WxUserVisitServiceImpl implements WxUserVisitService { @Override public Long queryVisitUv(WxUserVisit record) { - if(wxMallService.isgroupSupport(record)){ - record.setParentTenantId(record.getTenantId()); - record.setTenantId(null); + WxUserVisit wuv = new WxUserVisit(); + BeanUtils.copyProperties(record,wuv); + if(wxMallService.isgroupSupport(wuv)){ + wuv.setParentTenantId(wuv.getTenantId()); + wuv.setTenantId(null); } - return wxUserVisitMapper.queryVisitUv(record); + return wxUserVisitMapper.queryVisitUv(wuv); } }