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