From 10b7b7d9f622829f157c15b305e59b1db3f2aa9b Mon Sep 17 00:00:00 2001 From: xhxu Date: Wed, 5 Aug 2020 15:43:59 +0800 Subject: [PATCH] bug --- .../datatower/WxUserStructureController.java | 8 ++++++-- .../controller/mem/WxLevelConfigController.java | 17 ++++++++++++++++- .../iformall/domain/po/base/TenantEntity.java | 8 ++++++++ .../service/impl/WxChartServiceImpl.java | 2 +- .../service/impl/WxLevelConfigServiceImpl.java | 5 ++++- .../src/main/resources/mapper/WxShopMapper.xml | 2 +- 6 files changed, 36 insertions(+), 6 deletions(-) diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/datatower/WxUserStructureController.java b/mallinkAdmin/src/main/java/com/iformall/controller/datatower/WxUserStructureController.java index fdcce57ea..a7811670d 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/datatower/WxUserStructureController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/datatower/WxUserStructureController.java @@ -111,14 +111,18 @@ public class WxUserStructureController extends BaseController { public ResultData findUserLevelStructure(Date startTime, Date endTime) { logger.debug("[" + getIpAddr() + "] WxUserStructureController::findUserAgeStructure"); WxLevelConfig wxLevelConfig = new WxLevelConfig(); - wxLevelConfig.updateTenantInfo(getTenantInfo()); + if(StringUtils.isNotBlank(getTenantInfo().getParentTenantId())){ + wxLevelConfig.setTenantId(getTenantInfo().getParentTenantId()); + }else{ + wxLevelConfig.setTenantId(getTenantInfo().getTenantId()); + } wxLevelConfig.setSortColumns(BaseEntity.SortField.Points_ASC); List levelList = wxLevelConfigService.findList(wxLevelConfig); for( int i = 0; i < levelList.size(); i++) { WxCUserBasicInfoDto dto = new WxCUserBasicInfoDto(); - dto.updateTenantInfo(getTenantInfo()); + dto.updateFinalTenantInfo(getTenantInfo()); dto.setStartTime(startTime); dto.setEndTime(endTime); if (i + 1 < levelList.size()) { 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 b0207201d..56a25fdc0 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/mem/WxLevelConfigController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/mem/WxLevelConfigController.java @@ -4,6 +4,8 @@ import com.iformall.annotation.SystemControllerLog; import com.iformall.common.ErrorCode; import com.iformall.controller.base.BaseController; import com.iformall.domain.po.base.BaseEntity; +import com.iformall.domain.po.base.TenantEntity; +import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; @@ -45,7 +47,11 @@ public class WxLevelConfigController extends BaseController { public ResultData list(@ModelAttribute WxLevelConfig wxLevelConfig, Integer pageNum, Integer pageSize) { logger.debug("[" + getIpAddr() + "] WxLevelConfigController::list"); if (null == wxLevelConfig) wxLevelConfig = new WxLevelConfig(); - wxLevelConfig.updateTenantInfo(getTenantInfo()); + if(StringUtils.isNotBlank(getTenantInfo().getParentTenantId())){ + wxLevelConfig.setTenantId(getTenantInfo().getParentTenantId()); + }else{ + wxLevelConfig.setTenantId(getTenantInfo().getTenantId()); + } wxLevelConfig.setSortColumns(BaseEntity.SortField.Points_ASC); final PageInfo page = wxLevelConfigService.listAsPage(wxLevelConfig, pageNum, pageSize); return new ResultData(page); @@ -57,6 +63,9 @@ public class WxLevelConfigController extends BaseController { public ResultData add(@RequestBody List levelConfigs) { logger.debug("[" + getIpAddr() + "] WxLevelConfigController::add"); try { + if (StringUtils.isNotBlank(getTenantInfo().getParentTenantId())) { + return new ResultData(ErrorCode.USER_NO_PERMISSION.getCode(), "广场用户无此权限"); + } wxLevelConfigService.batchSave(getTenantInfo(), levelConfigs); } catch (Exception e) { logger.error(e.getMessage()); @@ -71,6 +80,9 @@ public class WxLevelConfigController extends BaseController { public ResultData updateCapabilities(@RequestBody List levelConfigs) { logger.debug("[" + getIpAddr() + "] WxLevelConfigController::add"); try { + if (StringUtils.isNotBlank(getTenantInfo().getParentTenantId())) { + return new ResultData(ErrorCode.USER_NO_PERMISSION.getCode(), "广场用户无此权限"); + } wxLevelConfigService.batchUpdateCapabilities(getTenantInfo(), levelConfigs); } catch (Exception e) { logger.error(e.getMessage()); @@ -84,6 +96,9 @@ public class WxLevelConfigController extends BaseController { @SystemControllerLog(description = "会员等级权益-删除") public ResultData delete(@RequestBody WxLevelConfig wxLevelConfig) { logger.debug("[" + getIpAddr() + "] WxLevelConfigController::delete"); + if (StringUtils.isNotBlank(getTenantInfo().getParentTenantId())) { + return new ResultData(ErrorCode.USER_NO_PERMISSION.getCode(), "广场用户无此权限"); + } wxLevelConfigService.deleteById(wxLevelConfig.getId()); return new ResultData(Result.SUCCESS, "删除成功", null); } diff --git a/mallinkService/src/main/java/com/iformall/domain/po/base/TenantEntity.java b/mallinkService/src/main/java/com/iformall/domain/po/base/TenantEntity.java index 3840d552e..2ddf0e2a8 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/base/TenantEntity.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/base/TenantEntity.java @@ -40,4 +40,12 @@ public class TenantEntity extends BaseEntity { setTenantId(info.getTenantId()); } } + + public void updateFinalTenantInfo(BaseTenantEntity info){ + if (StringUtils.isNotBlank(info.getParentTenantId())) { + setParentTenantId(info.getParentTenantId()); + }else{ + setTenantId(info.getTenantId()); + } + } } diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxChartServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxChartServiceImpl.java index a23afaf93..9b5130b0e 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxChartServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxChartServiceImpl.java @@ -2168,7 +2168,7 @@ public class WxChartServiceImpl implements WxChartDataService { for (int i = 0; i < levelList.size(); i++) { WxCUserBasicInfoDto dto = new WxCUserBasicInfoDto(); - dto.updateTenantInfo(tenantEntity); + dto.updateFinalTenantInfo(tenantEntity); dto.setStartTime(DateUtils.stringToDate(startdate)); dto.setEndTime(DateUtils.stringToDate(enddate)); if (i + 1 < levelList.size()) { diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxLevelConfigServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxLevelConfigServiceImpl.java index 76c92bc72..7abc8d2e2 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxLevelConfigServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxLevelConfigServiceImpl.java @@ -27,8 +27,11 @@ import java.util.List; @Service public class WxLevelConfigServiceImpl implements WxLevelConfigService { + private final Logger logger = LoggerFactory.getLogger(this.getClass()); + private final static String CAPABILITY_SEND_CAR_COUPON = "carCouponCount"; + @Autowired WxLevelConfigMapper wxLevelConfigMapper; @@ -56,7 +59,7 @@ public class WxLevelConfigServiceImpl implements WxLevelConfigService { l.setScale(WxLevelConfig.DEFAULT_SCALE); } WxCUserBasicInfoDto dto = new WxCUserBasicInfoDto(); - dto.updateTenantInfo(record); + dto.updateFinalTenantInfo(record); dto.setLevelStartScore(l.getPoints()); if (i + 1 ,count(distinct w.shop_id) xCount from wx_merchant_shop w left join wx_shop s on w.shop_id=s.id - where w.is_del=0 + where w.is_del=0 and s.is_del=0 and w.`tenant_id` = #{tenantId}