From 56dafea2a484c4eac2f2aa8c7b808ab1e4a3870a Mon Sep 17 00:00:00 2001 From: winter Date: Sat, 20 Apr 2024 12:44:14 +0800 Subject: [PATCH] fix bug --- .../controller/basic/WxMallBuildingController.java | 8 +++++--- .../iformall/controller/basic/WxMerchantController.java | 2 +- .../controller/basic/WxProjectConfigController.java | 4 +++- .../com/iformall/controller/WxMallBuildingController.java | 6 ++++-- .../java/com/iformall/service/WxMallBuildingService.java | 2 +- .../iformall/service/impl/WxMallBuildingServiceImpl.java | 6 ++---- .../com/iformall/service/impl/WxMerchantServiceImpl.java | 4 +++- .../controller/basic/WxMallBuildingController.java | 5 +++-- 8 files changed, 22 insertions(+), 15 deletions(-) diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/basic/WxMallBuildingController.java b/mallinkAdmin/src/main/java/com/iformall/controller/basic/WxMallBuildingController.java index 32e377604..53f5030b6 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/basic/WxMallBuildingController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/basic/WxMallBuildingController.java @@ -1,6 +1,7 @@ package com.iformall.controller.basic; import com.iformall.annotation.SystemControllerLog; +import com.iformall.annotation.UserDataRuleAnnotation; import com.iformall.common.ErrorCode; import com.iformall.common.ResultData; import com.iformall.controller.base.BaseController; @@ -31,12 +32,13 @@ public class WxMallBuildingController extends BaseController { @Qualifier("objectCommonRedisTemplate") RedisTemplate objectCommonRedisTemplate; + @UserDataRuleAnnotation("") @ApiOperation("获取楼层楼座数据") @GetMapping("getbuildingfloorlist") @SystemControllerLog(description = "商城-楼座-获取楼层楼座数据") - public ResultData getbuildingfloorlist() { - logger.debug("[" + getIpAddr() + "] WxMallBuildingController::getbuildingfloorlist"); - return wxMallBuildingService.getBuildingFloorList(getTenantInfo()); + public ResultData getbuildingfloorlist(WxMallBuilding wxMallBuilding) { + wxMallBuilding.updateTenantInfo(getTenantInfo()); + return wxMallBuildingService.getBuildingFloorList(wxMallBuilding); } @ApiOperation("保存楼层楼座地图") diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/basic/WxMerchantController.java b/mallinkAdmin/src/main/java/com/iformall/controller/basic/WxMerchantController.java index 360fcb113..b410d3587 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/basic/WxMerchantController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/basic/WxMerchantController.java @@ -62,7 +62,7 @@ public class WxMerchantController extends BaseController { @Autowired private WxMerchantRelationService wxMerchantRelationService; - + @UserDataRuleAnnotation("merchant_list") @ApiOperation("分页列表接口") @GetMapping("listVo") @ApiImplicitParams({ 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 93db530d1..659079892 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/basic/WxProjectConfigController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/basic/WxProjectConfigController.java @@ -673,7 +673,9 @@ public class WxProjectConfigController extends BaseController { TenantEntity tenantEntity = new TenantEntity(); tenantEntity.setTenantId(wxMall.getTenantId()); - ResultData wxMallBuildingFloorList = wxMallBuildingService.getBuildingFloorList(tenantEntity); + WxMallBuilding b = new WxMallBuilding(); + b.updateTenantInfo(tenantEntity); + ResultData wxMallBuildingFloorList = wxMallBuildingService.getBuildingFloorList(b); map.put("wxMallBuildingFloorList",wxMallBuildingFloorList.data); WxAppinfo wxAppinfo = new WxAppinfo(); wxAppinfo.setTenantId(wxMall.getTenantId()); diff --git a/mallinkCApi/src/main/java/com/iformall/controller/WxMallBuildingController.java b/mallinkCApi/src/main/java/com/iformall/controller/WxMallBuildingController.java index 8421da521..b9e6a9bbd 100644 --- a/mallinkCApi/src/main/java/com/iformall/controller/WxMallBuildingController.java +++ b/mallinkCApi/src/main/java/com/iformall/controller/WxMallBuildingController.java @@ -1,6 +1,7 @@ package com.iformall.controller; import com.iformall.common.ResultData; +import com.iformall.domain.po.WxMallBuilding; import com.iformall.service.WxMallBuildingService; import io.swagger.annotations.ApiOperation; import org.slf4j.Logger; @@ -21,7 +22,8 @@ public class WxMallBuildingController extends BaseController { @ApiOperation("获取楼层楼座数据") @GetMapping("getbuildingfloorlist") public ResultData getbuildingfloorlist() { - logger.debug("[" + getIpAddr() + "] WxMallBuildingController::getbuildingfloorlist"); - return wxMallBuildingService.getBuildingFloorList(getTenantInfo()); + WxMallBuilding b = new WxMallBuilding(); + b.updateTenantInfo(getTenantInfo()); + return wxMallBuildingService.getBuildingFloorList(b); } } diff --git a/mallinkService/src/main/java/com/iformall/service/WxMallBuildingService.java b/mallinkService/src/main/java/com/iformall/service/WxMallBuildingService.java index 22f5cc731..ba9ac3073 100644 --- a/mallinkService/src/main/java/com/iformall/service/WxMallBuildingService.java +++ b/mallinkService/src/main/java/com/iformall/service/WxMallBuildingService.java @@ -54,7 +54,7 @@ public interface WxMallBuildingService { ResultData getBuildingList(TenantEntity tenantEntity); - ResultData getBuildingFloorList(TenantEntity tenantEntity); + ResultData getBuildingFloorList(WxMallBuilding wxMallBuilding); /** * 新增楼层楼座 diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxMallBuildingServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxMallBuildingServiceImpl.java index dd18fc009..d128345e3 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxMallBuildingServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxMallBuildingServiceImpl.java @@ -118,15 +118,13 @@ public class WxMallBuildingServiceImpl implements WxMallBuildingService { } @Override - public ResultData getBuildingFloorList(TenantEntity tenantEntity) { - String key = Constant.mallBuildingPrev + tenantEntity.getTenantId(); + public ResultData getBuildingFloorList(WxMallBuilding wxMallBuilding) { + String key = Constant.mallBuildingPrev + wxMallBuilding.getTenantId(); List wxMallBuildings = RedisCacheUtils.getCacheListObject(objectCommonRedisTemplate, key, WxMallBuilding.class); if(wxMallBuildings != null){ return new ResultData(wxMallBuildings); } wxMallBuildings = new ArrayList(); - WxMallBuilding wxMallBuilding = new WxMallBuilding(); - wxMallBuilding.updateTenantInfo(tenantEntity); List buildings = wxMallBuildingMapper.findList(wxMallBuilding); wxMallBuildings = buildings.stream().map(b -> { WxMallBuilding tempb = new WxMallBuilding(); diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxMerchantServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxMerchantServiceImpl.java index fcea051d0..18a3becee 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxMerchantServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxMerchantServiceImpl.java @@ -2185,7 +2185,9 @@ public class WxMerchantServiceImpl implements WxMerchantService { Long buildingId = null; Long floorId = null; try { - ResultData builds = wxMallBuildingService.getBuildingFloorList(tenantEntity); + WxMallBuilding b = new WxMallBuilding(); + b.updateTenantInfo(tenantEntity); + ResultData builds = wxMallBuildingService.getBuildingFloorList(b); if (null == builds || null == builds.data) { throw new MallinkException(ErrorCode.SYS_SERVER_ERROR.getCode(),"楼层楼座未查询到."); } diff --git a/mallinkTTAdmin/src/main/java/com/iformall/controller/basic/WxMallBuildingController.java b/mallinkTTAdmin/src/main/java/com/iformall/controller/basic/WxMallBuildingController.java index 32e377604..7c6f3a751 100644 --- a/mallinkTTAdmin/src/main/java/com/iformall/controller/basic/WxMallBuildingController.java +++ b/mallinkTTAdmin/src/main/java/com/iformall/controller/basic/WxMallBuildingController.java @@ -35,8 +35,9 @@ public class WxMallBuildingController extends BaseController { @GetMapping("getbuildingfloorlist") @SystemControllerLog(description = "商城-楼座-获取楼层楼座数据") public ResultData getbuildingfloorlist() { - logger.debug("[" + getIpAddr() + "] WxMallBuildingController::getbuildingfloorlist"); - return wxMallBuildingService.getBuildingFloorList(getTenantInfo()); + WxMallBuilding b = new WxMallBuilding(); + b.updateTenantInfo(getTenantInfo()); + return wxMallBuildingService.getBuildingFloorList(b); } @ApiOperation("保存楼层楼座地图")