| @@ -1,6 +1,7 @@ | |||||
| package com.iformall.controller.basic; | package com.iformall.controller.basic; | ||||
| import com.iformall.annotation.SystemControllerLog; | import com.iformall.annotation.SystemControllerLog; | ||||
| import com.iformall.annotation.UserDataRuleAnnotation; | |||||
| import com.iformall.common.ErrorCode; | import com.iformall.common.ErrorCode; | ||||
| import com.iformall.common.ResultData; | import com.iformall.common.ResultData; | ||||
| import com.iformall.controller.base.BaseController; | import com.iformall.controller.base.BaseController; | ||||
| @@ -31,12 +32,13 @@ public class WxMallBuildingController extends BaseController { | |||||
| @Qualifier("objectCommonRedisTemplate") | @Qualifier("objectCommonRedisTemplate") | ||||
| RedisTemplate<String, Object> objectCommonRedisTemplate; | RedisTemplate<String, Object> objectCommonRedisTemplate; | ||||
| @UserDataRuleAnnotation("") | |||||
| @ApiOperation("获取楼层楼座数据") | @ApiOperation("获取楼层楼座数据") | ||||
| @GetMapping("getbuildingfloorlist") | @GetMapping("getbuildingfloorlist") | ||||
| @SystemControllerLog(description = "商城-楼座-获取楼层楼座数据") | @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("保存楼层楼座地图") | @ApiOperation("保存楼层楼座地图") | ||||
| @@ -62,7 +62,7 @@ public class WxMerchantController extends BaseController { | |||||
| @Autowired | @Autowired | ||||
| private WxMerchantRelationService wxMerchantRelationService; | private WxMerchantRelationService wxMerchantRelationService; | ||||
| @UserDataRuleAnnotation("merchant_list") | |||||
| @ApiOperation("分页列表接口") | @ApiOperation("分页列表接口") | ||||
| @GetMapping("listVo") | @GetMapping("listVo") | ||||
| @ApiImplicitParams({ | @ApiImplicitParams({ | ||||
| @@ -673,7 +673,9 @@ public class WxProjectConfigController extends BaseController { | |||||
| TenantEntity tenantEntity = new TenantEntity(); | TenantEntity tenantEntity = new TenantEntity(); | ||||
| tenantEntity.setTenantId(wxMall.getTenantId()); | 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); | map.put("wxMallBuildingFloorList",wxMallBuildingFloorList.data); | ||||
| WxAppinfo wxAppinfo = new WxAppinfo(); | WxAppinfo wxAppinfo = new WxAppinfo(); | ||||
| wxAppinfo.setTenantId(wxMall.getTenantId()); | wxAppinfo.setTenantId(wxMall.getTenantId()); | ||||
| @@ -1,6 +1,7 @@ | |||||
| package com.iformall.controller; | package com.iformall.controller; | ||||
| import com.iformall.common.ResultData; | import com.iformall.common.ResultData; | ||||
| import com.iformall.domain.po.WxMallBuilding; | |||||
| import com.iformall.service.WxMallBuildingService; | import com.iformall.service.WxMallBuildingService; | ||||
| import io.swagger.annotations.ApiOperation; | import io.swagger.annotations.ApiOperation; | ||||
| import org.slf4j.Logger; | import org.slf4j.Logger; | ||||
| @@ -21,7 +22,8 @@ public class WxMallBuildingController extends BaseController { | |||||
| @ApiOperation("获取楼层楼座数据") | @ApiOperation("获取楼层楼座数据") | ||||
| @GetMapping("getbuildingfloorlist") | @GetMapping("getbuildingfloorlist") | ||||
| public ResultData getbuildingfloorlist() { | public ResultData getbuildingfloorlist() { | ||||
| logger.debug("[" + getIpAddr() + "] WxMallBuildingController::getbuildingfloorlist"); | |||||
| return wxMallBuildingService.getBuildingFloorList(getTenantInfo()); | |||||
| WxMallBuilding b = new WxMallBuilding(); | |||||
| b.updateTenantInfo(getTenantInfo()); | |||||
| return wxMallBuildingService.getBuildingFloorList(b); | |||||
| } | } | ||||
| } | } | ||||
| @@ -54,7 +54,7 @@ public interface WxMallBuildingService { | |||||
| ResultData getBuildingList(TenantEntity tenantEntity); | ResultData getBuildingList(TenantEntity tenantEntity); | ||||
| ResultData getBuildingFloorList(TenantEntity tenantEntity); | |||||
| ResultData getBuildingFloorList(WxMallBuilding wxMallBuilding); | |||||
| /** | /** | ||||
| * 新增楼层楼座 | * 新增楼层楼座 | ||||
| @@ -118,15 +118,13 @@ public class WxMallBuildingServiceImpl implements WxMallBuildingService { | |||||
| } | } | ||||
| @Override | @Override | ||||
| public ResultData getBuildingFloorList(TenantEntity tenantEntity) { | |||||
| String key = Constant.mallBuildingPrev + tenantEntity.getTenantId(); | |||||
| public ResultData getBuildingFloorList(WxMallBuilding wxMallBuilding) { | |||||
| String key = Constant.mallBuildingPrev + wxMallBuilding.getTenantId(); | |||||
| List<WxMallBuilding> wxMallBuildings = RedisCacheUtils.getCacheListObject(objectCommonRedisTemplate, key, WxMallBuilding.class); | List<WxMallBuilding> wxMallBuildings = RedisCacheUtils.getCacheListObject(objectCommonRedisTemplate, key, WxMallBuilding.class); | ||||
| if(wxMallBuildings != null){ | if(wxMallBuildings != null){ | ||||
| return new ResultData(wxMallBuildings); | return new ResultData(wxMallBuildings); | ||||
| } | } | ||||
| wxMallBuildings = new ArrayList<WxMallBuilding>(); | wxMallBuildings = new ArrayList<WxMallBuilding>(); | ||||
| WxMallBuilding wxMallBuilding = new WxMallBuilding(); | |||||
| wxMallBuilding.updateTenantInfo(tenantEntity); | |||||
| List<WxMallBuilding> buildings = wxMallBuildingMapper.findList(wxMallBuilding); | List<WxMallBuilding> buildings = wxMallBuildingMapper.findList(wxMallBuilding); | ||||
| wxMallBuildings = buildings.stream().map(b -> { | wxMallBuildings = buildings.stream().map(b -> { | ||||
| WxMallBuilding tempb = new WxMallBuilding(); | WxMallBuilding tempb = new WxMallBuilding(); | ||||
| @@ -2185,7 +2185,9 @@ public class WxMerchantServiceImpl implements WxMerchantService { | |||||
| Long buildingId = null; | Long buildingId = null; | ||||
| Long floorId = null; | Long floorId = null; | ||||
| try { | try { | ||||
| ResultData builds = wxMallBuildingService.getBuildingFloorList(tenantEntity); | |||||
| WxMallBuilding b = new WxMallBuilding(); | |||||
| b.updateTenantInfo(tenantEntity); | |||||
| ResultData builds = wxMallBuildingService.getBuildingFloorList(b); | |||||
| if (null == builds || null == builds.data) { | if (null == builds || null == builds.data) { | ||||
| throw new MallinkException(ErrorCode.SYS_SERVER_ERROR.getCode(),"楼层楼座未查询到."); | throw new MallinkException(ErrorCode.SYS_SERVER_ERROR.getCode(),"楼层楼座未查询到."); | ||||
| } | } | ||||
| @@ -35,8 +35,9 @@ public class WxMallBuildingController extends BaseController { | |||||
| @GetMapping("getbuildingfloorlist") | @GetMapping("getbuildingfloorlist") | ||||
| @SystemControllerLog(description = "商城-楼座-获取楼层楼座数据") | @SystemControllerLog(description = "商城-楼座-获取楼层楼座数据") | ||||
| public ResultData getbuildingfloorlist() { | public ResultData getbuildingfloorlist() { | ||||
| logger.debug("[" + getIpAddr() + "] WxMallBuildingController::getbuildingfloorlist"); | |||||
| return wxMallBuildingService.getBuildingFloorList(getTenantInfo()); | |||||
| WxMallBuilding b = new WxMallBuilding(); | |||||
| b.updateTenantInfo(getTenantInfo()); | |||||
| return wxMallBuildingService.getBuildingFloorList(b); | |||||
| } | } | ||||
| @ApiOperation("保存楼层楼座地图") | @ApiOperation("保存楼层楼座地图") | ||||