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 c0e97dbe1..d992c5357 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/basic/WxMerchantController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/basic/WxMerchantController.java @@ -78,7 +78,7 @@ public class WxMerchantController extends BaseController { WxUserDataRule dataRule = this.getCurrentDataFloors(); if (null != dataRule) { wxMerchant.setFloorForRule(dataRule.getFloorIds()); - wxMerchant.setBusinessForRule(dataRule.getBussinessIds()); + //wxMerchant.setBusinessForRule(dataRule.getBussinessIds()); } final PageInfo page = wxMerchantService.listVoAsPage(wxMerchant, pageNum, pageSize,false); return new ResultData(page); @@ -105,7 +105,7 @@ public class WxMerchantController extends BaseController { WxUserDataRule dataRule = this.getCurrentDataFloors(); if (null != dataRule) { wxMerchant.setFloorForRule(dataRule.getFloorIds()); - wxMerchant.setBusinessForRule(dataRule.getBussinessIds()); + //wxMerchant.setBusinessForRule(dataRule.getBussinessIds()); } final PageInfo page = wxMerchantService.listVoAsPage(wxMerchant, pageNum, pageSize,false); return new ResultData(page); @@ -366,7 +366,6 @@ public class WxMerchantController extends BaseController { return new ResultData(wxMerchant); } - @UserDataRuleAnnotation("merchant_list") @ApiOperation("商户数据导出") @GetMapping("/exportData") @SystemControllerLog(description = "商户-商户数据导出") @@ -374,6 +373,11 @@ public class WxMerchantController extends BaseController { wxMerchant.updateTenantInfo(getTenantInfo()); wxMerchant.setSortColumns(BaseEntity.SortField.TopTime_DESC); wxMerchant.setIsPrivate(EnumYesOrNo.NO.getCode()); + WxUserDataRule dataRule = this.getCurrentDataFloors(); + if (null != dataRule) { + wxMerchant.setFloorForRule(dataRule.getFloorIds()); + //wxMerchant.setBusinessForRule(dataRule.getBussinessIds()); + } wxMerchantService.exportData(wxMerchant,request,response); } diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/contract/WxPropertyContractController.java b/mallinkAdmin/src/main/java/com/iformall/controller/contract/WxPropertyContractController.java index 4003c8ca2..8b364e5ea 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/contract/WxPropertyContractController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/contract/WxPropertyContractController.java @@ -55,7 +55,6 @@ public class WxPropertyContractController extends WxContractBaseController { @Autowired private WxShopService wxShopService; - @UserDataRuleAnnotation("property_contract_list") @GetMapping("/list") @ApiImplicitParams({ @ApiImplicitParam(name = "pageNum", value = "页数", dataType = "int", paramType = "query", required = true), @@ -71,7 +70,7 @@ public class WxPropertyContractController extends WxContractBaseController { WxUserDataRule dataRule = this.getCurrentDataFloors(); if (null != dataRule) { wxPropertyContract.setFloorForRule(dataRule.getFloorIds()); - wxPropertyContract.setBusinessForRule(dataRule.getBussinessIds()); + //wxPropertyContract.setBusinessForRule(dataRule.getBussinessIds()); } PageInfo pageInfo = wxPropertyContractService.listAsPage(wxPropertyContract, pageNum, pageSize); Integer hasFlow = null; diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/contract/WxRentContractController.java b/mallinkAdmin/src/main/java/com/iformall/controller/contract/WxRentContractController.java index 1b24e5626..91582110c 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/contract/WxRentContractController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/contract/WxRentContractController.java @@ -64,7 +64,6 @@ public class WxRentContractController extends WxContractBaseController { @Autowired WxMallFloorService floorService; - @UserDataRuleAnnotation("rent_contract_list") @GetMapping("/list") @ApiImplicitParams({ @ApiImplicitParam(name = "pageNum", value = "页数", dataType = "int", paramType = "query", required = true), @@ -80,7 +79,7 @@ public class WxRentContractController extends WxContractBaseController { WxUserDataRule dataRule = this.getCurrentDataFloors(); if (null != dataRule) { wxRentContract.setFloorForRule(dataRule.getFloorIds()); - wxRentContract.setBusinessForRule(dataRule.getBussinessIds()); + //wxRentContract.setBusinessForRule(dataRule.getBussinessIds()); } PageInfo page = wxRentContractService.getRentContractList(wxRentContract, pageNum, pageSize); Integer hasFlow = null; diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/contract/WxRentPropertyContractController.java b/mallinkAdmin/src/main/java/com/iformall/controller/contract/WxRentPropertyContractController.java index 37920e93e..d0a5e9edb 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/contract/WxRentPropertyContractController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/contract/WxRentPropertyContractController.java @@ -42,7 +42,6 @@ public class WxRentPropertyContractController extends WxContractBaseController { @Autowired private WxShopService wxShopService; - @UserDataRuleAnnotation("rent_property_contract_list") @GetMapping("/list") @ApiImplicitParams({ @ApiImplicitParam(name = "pageNum", value = "页数", dataType = "int", paramType = "query", required = true), @@ -56,7 +55,7 @@ public class WxRentPropertyContractController extends WxContractBaseController { WxUserDataRule dataRule = this.getCurrentDataFloors(); if (null != dataRule) { wxRentPropertyContractVo.setFloorForRule(dataRule.getFloorIds()); - wxRentPropertyContractVo.setBusinessForRule(dataRule.getBussinessIds()); + //wxRentPropertyContractVo.setBusinessForRule(dataRule.getBussinessIds()); } PageInfo page = wxRentPropertyContractService.listContractVo(wxRentPropertyContractVo, pageNum, pageSize); Integer hasFlow = null; diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/datatower/WxMerchantTradeDailyController.java b/mallinkAdmin/src/main/java/com/iformall/controller/datatower/WxMerchantTradeDailyController.java index 56c4b5ade..951dea6b7 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/datatower/WxMerchantTradeDailyController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/datatower/WxMerchantTradeDailyController.java @@ -37,7 +37,6 @@ public class WxMerchantTradeDailyController extends BaseController { @TenantIgnore - @UserDataRuleAnnotation("merchant_trade") @ApiOperation("获得解单列表") @GetMapping("/list") @ApiImplicitParams({ @@ -52,7 +51,7 @@ public class WxMerchantTradeDailyController extends BaseController { WxUserDataRule dataRule = this.getCurrentDataFloors(); if (null != dataRule) { wxMerchantTradeDaily.setFloorForRule(dataRule.getFloorIds()); - wxMerchantTradeDaily.setBusinessForRule(dataRule.getBussinessIds()); + //wxMerchantTradeDaily.setBusinessForRule(dataRule.getBussinessIds()); } wxMerchantTradeDaily.setSortColumns(BaseEntity.SortField.ReportDate_DESC,BaseEntity.SortField.CreateDate_DESC); PageInfo page = wxMerchantTradeDailyService.listAsPageVo(wxMerchantTradeDaily, pageNum, pageSize); @@ -149,7 +148,6 @@ public class WxMerchantTradeDailyController extends BaseController { } @TenantIgnore - @UserDataRuleAnnotation("merchant_trade") @GetMapping("exportData") @SystemControllerLog(description = "商户解单数据-导出数据") public void exportData(@ModelAttribute WxMerchantTradeDaily wxMerchantTradeDaily, HttpServletRequest request, HttpServletResponse response) { @@ -159,6 +157,11 @@ public class WxMerchantTradeDailyController extends BaseController { } wxMerchantTradeDaily.updateTenantInfo(getTenantInfo()); wxMerchantTradeDaily.setSortColumns(BaseEntity.SortField.ReportDate_DESC,BaseEntity.SortField.MerchantId_DESC); + WxUserDataRule dataRule = this.getCurrentDataFloors(); + if (null != dataRule) { + wxMerchantTradeDaily.setFloorForRule(dataRule.getFloorIds()); + //wxMerchantTradeDaily.setBusinessForRule(dataRule.getBussinessIds()); + } wxMerchantTradeDailyService.exportData(wxMerchantTradeDaily, request, response); } 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 e0c7a3851..49c70599b 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxMerchantServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxMerchantServiceImpl.java @@ -1041,7 +1041,16 @@ public class WxMerchantServiceImpl implements WxMerchantService { if(wxMerchant.getIsAdmin() == null){ wxMerchant.setAdminTypes(EnumMerchantAdmin.getOrdinaryTypes()); } - + + if (null != wxMerchant.getFloorForRule() || null != wxMerchant.getBuilding() || null != wxMerchant.getFloor()) { + List floorMerchantIds = getFloorBuildingMerchantIds(wxMerchant,wxMerchant.getFloorForRule(),wxMerchant.getBuilding(),wxMerchant.getFloor()); + if (null != floorMerchantIds && floorMerchantIds.size() > 0 ) { + wxMerchant.setIds(floorMerchantIds); + }else { + wxMerchant.setId(-1L); + } + } + List list = wxMerchantMapper.findList(wxMerchant); WxBusiness bq = new WxBusiness();