From 922b7cdfa8985a5d6eec297220b576431b48326d Mon Sep 17 00:00:00 2001 From: winter Date: Wed, 21 Aug 2024 14:32:00 +0800 Subject: [PATCH] fix --- .../basic/WxMallBuildingController.java | 2 +- .../controller/basic/WxMerchantController.java | 6 +++--- .../controller/basic/WxShopController.java | 2 +- .../contract/WxPropertyContractController.java | 2 +- .../contract/WxRentContractController.java | 2 +- .../WxRentPropertyContractController.java | 2 +- .../WxMerchantTradeDailyController.java | 6 +++--- .../controller/market/WxEnergyController.java | 2 +- .../market/WxMerchantMicroPayController.java | 4 ++-- .../controller/rent/WxAllBillController.java | 18 +++++++++--------- .../controller/WxMallAdminController.java | 6 +++--- .../com/iformall/domain/po/WxUserDataRule.java | 8 ++++++++ 12 files changed, 34 insertions(+), 26 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 09f74841d..e28aab0df 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/basic/WxMallBuildingController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/basic/WxMallBuildingController.java @@ -41,7 +41,7 @@ public class WxMallBuildingController extends BaseController { if (null != dataRule) { wxMallBuilding.setFloorForRule(dataRule.getFloorIds()); wxMallBuilding.setBusinessForRule(dataRule.getBussinessIds()); - wxMallBuilding.setShopTypeForRule(dataRule.getShopType()); + wxMallBuilding.setShopTypeForRule(dataRule.getShopTypes()); } return wxMallBuildingService.getBuildingFloorList(wxMallBuilding,this.getUser()); } 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 086c9cc9b..99c8438d2 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/basic/WxMerchantController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/basic/WxMerchantController.java @@ -79,7 +79,7 @@ public class WxMerchantController extends BaseController { if (null != dataRule) { wxMerchant.setFloorForRule(dataRule.getFloorIds()); wxMerchant.setBusinessForRule(dataRule.getBussinessIds()); - wxMerchant.setShopTypeForRule(dataRule.getShopType()); + wxMerchant.setShopTypeForRule(dataRule.getShopTypes()); } final PageInfo page = wxMerchantService.listVoAsPage(wxMerchant, pageNum, pageSize,false); return new ResultData(page); @@ -107,7 +107,7 @@ public class WxMerchantController extends BaseController { if (null != dataRule) { wxMerchant.setFloorForRule(dataRule.getFloorIds()); //wxMerchant.setBusinessForRule(dataRule.getBussinessIds()); - wxMerchant.setShopTypeForRule(dataRule.getShopType()); + wxMerchant.setShopTypeForRule(dataRule.getShopTypes()); } final PageInfo page = wxMerchantService.listVoAsPage(wxMerchant, pageNum, pageSize,false); return new ResultData(page); @@ -379,7 +379,7 @@ public class WxMerchantController extends BaseController { if (null != dataRule) { wxMerchant.setFloorForRule(dataRule.getFloorIds()); wxMerchant.setBusinessForRule(dataRule.getBussinessIds()); - wxMerchant.setShopTypeForRule(dataRule.getShopType()); + wxMerchant.setShopTypeForRule(dataRule.getShopTypes()); } wxMerchantService.exportData(wxMerchant,request,response); } diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/basic/WxShopController.java b/mallinkAdmin/src/main/java/com/iformall/controller/basic/WxShopController.java index 8688fbb7b..d810e6daf 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/basic/WxShopController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/basic/WxShopController.java @@ -39,7 +39,7 @@ public class WxShopController extends BaseController { if (null != dataRule) { wxShop.setFloorForRule(dataRule.getFloorIds()); wxShop.setBusinessForRule(dataRule.getBussinessIds()); - wxShop.setShopTypeForRule(dataRule.getShopType()); + wxShop.setShopTypeForRule(dataRule.getShopTypes()); } } 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 052ba1244..77866572e 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/contract/WxPropertyContractController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/contract/WxPropertyContractController.java @@ -79,7 +79,7 @@ public class WxPropertyContractController extends WxContractBaseController { if (null != dataRule) { wxPropertyContract.setFloorForRule(dataRule.getFloorIds()); wxPropertyContract.setBusinessForRule(dataRule.getBussinessIds()); - wxPropertyContract.setShopTypeForRule(dataRule.getShopType()); + wxPropertyContract.setShopTypeForRule(dataRule.getShopTypes()); } 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 eadd8c663..8dbcd2b29 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/contract/WxRentContractController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/contract/WxRentContractController.java @@ -76,7 +76,7 @@ public class WxRentContractController extends WxContractBaseController { if (null != dataRule) { wxRentContract.setFloorForRule(dataRule.getFloorIds()); wxRentContract.setBusinessForRule(dataRule.getBussinessIds()); - wxRentContract.setShopTypeForRule(dataRule.getShopType()); + wxRentContract.setShopTypeForRule(dataRule.getShopTypes()); } 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 95c0407c3..acdd913fd 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/contract/WxRentPropertyContractController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/contract/WxRentPropertyContractController.java @@ -56,7 +56,7 @@ public class WxRentPropertyContractController extends WxContractBaseController { if (null != dataRule) { wxRentPropertyContractVo.setFloorForRule(dataRule.getFloorIds()); wxRentPropertyContractVo.setBusinessForRule(dataRule.getBussinessIds()); - wxRentPropertyContractVo.setShopTypeForRule(dataRule.getShopType()); + wxRentPropertyContractVo.setShopTypeForRule(dataRule.getShopTypes()); } 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 30bebbe0d..17c67279a 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/datatower/WxMerchantTradeDailyController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/datatower/WxMerchantTradeDailyController.java @@ -52,7 +52,7 @@ public class WxMerchantTradeDailyController extends BaseController { if (null != dataRule) { wxMerchantTradeDaily.setFloorForRule(dataRule.getFloorIds()); //wxMerchantTradeDaily.setBusinessForRule(dataRule.getBussinessIds()); - wxMerchantTradeDaily.setShopTypeForRule(dataRule.getShopType()); + wxMerchantTradeDaily.setShopTypeForRule(dataRule.getShopTypes()); } wxMerchantTradeDaily.setSortColumns(BaseEntity.SortField.ReportDate_DESC,BaseEntity.SortField.CreateDate_DESC); PageInfo page = wxMerchantTradeDailyService.listAsPageVo(wxMerchantTradeDaily, pageNum, pageSize); @@ -69,7 +69,7 @@ public class WxMerchantTradeDailyController extends BaseController { if (null != dataRule) { wxMerchantTradeDaily.setFloorForRule(dataRule.getFloorIds()); wxMerchantTradeDaily.setBusinessForRule(dataRule.getBussinessIds()); - wxMerchantTradeDaily.setShopTypeForRule(dataRule.getShopType()); + wxMerchantTradeDaily.setShopTypeForRule(dataRule.getShopTypes()); } return wxMerchantTradeDailyService.summary(wxMerchantTradeDaily); } @@ -163,7 +163,7 @@ public class WxMerchantTradeDailyController extends BaseController { if (null != dataRule) { wxMerchantTradeDaily.setFloorForRule(dataRule.getFloorIds()); //wxMerchantTradeDaily.setBusinessForRule(dataRule.getBussinessIds()); - wxMerchantTradeDaily.setShopTypeForRule(dataRule.getShopType()); + wxMerchantTradeDaily.setShopTypeForRule(dataRule.getShopTypes()); } wxMerchantTradeDailyService.exportData(wxMerchantTradeDaily, request, response); } diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/market/WxEnergyController.java b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxEnergyController.java index f59db3ac0..49eef52c1 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/market/WxEnergyController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxEnergyController.java @@ -83,7 +83,7 @@ public class WxEnergyController extends BaseController { if (null != dataRule) { record.setFloorForRule(dataRule.getFloorIds()); record.setBusinessForRule(dataRule.getBussinessIds()); - record.setShopTypeForRule(dataRule.getShopType()); + record.setShopTypeForRule(dataRule.getShopTypes()); } record.updateTenantInfo(getTenantInfo()); record.setSortColumns(BaseEntity.SortField.CreateTime_DESC); diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/market/WxMerchantMicroPayController.java b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxMerchantMicroPayController.java index 5c1449187..4736e251f 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/market/WxMerchantMicroPayController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxMerchantMicroPayController.java @@ -82,7 +82,7 @@ public class WxMerchantMicroPayController extends BaseController { if (null != dataRule) { dto.setFloorForRule(dataRule.getFloorIds()); dto.setBusinessForRule(dataRule.getBussinessIds()); - dto.setShopTypeForRule(dataRule.getShopType()); + dto.setShopTypeForRule(dataRule.getShopTypes()); } PageInfo page = markingDataReportService.pageMerchantMicroPay(dto); return new ResultData(page); @@ -97,7 +97,7 @@ public class WxMerchantMicroPayController extends BaseController { if (null != dataRule) { dto.setFloorForRule(dataRule.getFloorIds()); dto.setBusinessForRule(dataRule.getBussinessIds()); - dto.setShopTypeForRule(dataRule.getShopType()); + dto.setShopTypeForRule(dataRule.getShopTypes()); } markingDataReportService.exportMerchantMicroPay(dto, response); } diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/rent/WxAllBillController.java b/mallinkAdmin/src/main/java/com/iformall/controller/rent/WxAllBillController.java index 82bdcced7..ab80a9620 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/rent/WxAllBillController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/rent/WxAllBillController.java @@ -121,7 +121,7 @@ public class WxAllBillController extends BillBaseController { if (null != dataRule) { wxMerchant.setFloorForRule(dataRule.getFloorIds()); wxMerchant.setBusinessForRule(dataRule.getBussinessIds()); - wxMerchant.setShopTypeForRule(dataRule.getShopType()); + wxMerchant.setShopTypeForRule(dataRule.getShopTypes()); } return new ResultData(getVoPage(wxMerchant, pageNum, pageSize,null)); } @@ -190,7 +190,7 @@ public class WxAllBillController extends BillBaseController { if (null != dataRule) { wxMerchant.setFloorForRule(dataRule.getFloorIds()); wxMerchant.setBusinessForRule(dataRule.getBussinessIds()); - wxMerchant.setShopTypeForRule(dataRule.getShopType()); + wxMerchant.setShopTypeForRule(dataRule.getShopTypes()); } PageInfo page = getVoPage(wxMerchant, 1, 10000,null); excelService.exportExcel(page.getList(), null, "商户账单总览数据", WxMerchantBillVo.class, "商户账单总览数据.xlsx", response, false); @@ -359,7 +359,7 @@ public class WxAllBillController extends BillBaseController { if (null != dataRule) { wxMerchant.setFloorForRule(dataRule.getFloorIds()); wxMerchant.setBusinessForRule(dataRule.getBussinessIds()); - wxMerchant.setShopTypeForRule(dataRule.getShopType()); + wxMerchant.setShopTypeForRule(dataRule.getShopTypes()); } if (isOwe) { wxMerchant.setOweBillBeforeDays(getOweBillBeforeDays()); @@ -420,7 +420,7 @@ public class WxAllBillController extends BillBaseController { if (null != dataRule) { wxMerchant.setFloorForRule(dataRule.getFloorIds()); wxMerchant.setBusinessForRule(dataRule.getBussinessIds()); - wxMerchant.setShopTypeForRule(dataRule.getShopType()); + wxMerchant.setShopTypeForRule(dataRule.getShopTypes()); } wxMerchant.setOweBillBeforeDays(getOweBillBeforeDays()); wxMerchant.setNearBillBeforeDays(nearBillBeforeDays); @@ -451,7 +451,7 @@ public class WxAllBillController extends BillBaseController { if (null != dataRule) { wxMerchant.setFloorForRule(dataRule.getFloorIds()); wxMerchant.setBusinessForRule(dataRule.getBussinessIds()); - wxMerchant.setShopTypeForRule(dataRule.getShopType()); + wxMerchant.setShopTypeForRule(dataRule.getShopTypes()); } wxMerchant.setOweBillBeforeDays(getOweBillBeforeDays()); wxMerchant.setNearBillBeforeDays(nearBillBeforeDays); @@ -617,7 +617,7 @@ public class WxAllBillController extends BillBaseController { if (null != dataRule) { wxMerchant.setFloorForRule(dataRule.getFloorIds()); wxMerchant.setBusinessForRule(dataRule.getBussinessIds()); - wxMerchant.setShopTypeForRule(dataRule.getShopType()); + wxMerchant.setShopTypeForRule(dataRule.getShopTypes()); } return new ResultData(getVoPage(wxMerchant, pageNum, pageSize,EnumBillStatus.STOP_TO_SETTLE.getCode())); } @@ -729,7 +729,7 @@ public class WxAllBillController extends BillBaseController { if (null != dataRule) { record.setFloorForRule(dataRule.getFloorIds()); record.setBusinessForRule(dataRule.getBussinessIds()); - record.setShopTypeForRule(dataRule.getShopType()); + record.setShopTypeForRule(dataRule.getShopTypes()); } if (null != record.getOnlyOweOrNear()) { if (EnumBillOweOrNearType.OWE.getCode().intValue() == record.getOnlyOweOrNear().intValue()) { @@ -752,7 +752,7 @@ public class WxAllBillController extends BillBaseController { if (null != dataRule) { wxBillRent.setFloorForRule(dataRule.getFloorIds()); wxBillRent.setBusinessForRule(dataRule.getBussinessIds()); - wxBillRent.setShopTypeForRule(dataRule.getShopType()); + wxBillRent.setShopTypeForRule(dataRule.getShopTypes()); } if (null != wxBillRent.getOnlyOweOrNear()) { if (EnumBillOweOrNearType.OWE.getCode().intValue() == wxBillRent.getOnlyOweOrNear().intValue()) { @@ -775,7 +775,7 @@ public class WxAllBillController extends BillBaseController { if (null != dataRule) { record.setFloorForRule(dataRule.getFloorIds()); record.setBusinessForRule(dataRule.getBussinessIds()); - record.setShopTypeForRule(dataRule.getShopType()); + record.setShopTypeForRule(dataRule.getShopTypes()); } if (null != record.getOnlyOweOrNear()) { if (EnumBillOweOrNearType.OWE.getCode().intValue() == record.getOnlyOweOrNear().intValue()) { diff --git a/mallinkBApi/src/main/java/com/iformall/controller/WxMallAdminController.java b/mallinkBApi/src/main/java/com/iformall/controller/WxMallAdminController.java index acd376584..fd155204c 100644 --- a/mallinkBApi/src/main/java/com/iformall/controller/WxMallAdminController.java +++ b/mallinkBApi/src/main/java/com/iformall/controller/WxMallAdminController.java @@ -135,7 +135,7 @@ public class WxMallAdminController extends BaseController { if (null != dataRule) { tenantEntity.setFloorForRule(dataRule.getFloorIds()); tenantEntity.setBusinessForRule(dataRule.getBussinessIds()); - tenantEntity.setShopTypeForRule(dataRule.getShopType()); + tenantEntity.setShopTypeForRule(dataRule.getShopTypes()); } } @@ -382,8 +382,8 @@ public class WxMallAdminController extends BaseController { @ApiOperation("抄表数据分页列表接口") @GetMapping("readingList") public ResultData readingList(@ModelAttribute WxEnergyMeterReading record) { - record.updateTenantInfo(getTenantInfo()); record.setIsDel(EnumYesOrNo.NO.getCode()); + setQueryDataRule(record); record.setSortColumns(BaseEntity.SortField.CreateTime_DESC); PageInfo page = wxEnergyService.readingListAsPage(record, 1, 1000); return new ResultData(page); @@ -392,7 +392,7 @@ public class WxMallAdminController extends BaseController { //能源抄表费用 @PostMapping("commitEnergyReading") public ResultData commitEnergyReading(@RequestBody WxEnergyMeterReading record) { - record.updateTenantInfo(getTenantInfo()); + setQueryDataRule(record); wxEnergyService.commitReading(record,this.getLoginMallUserInfo()); return new ResultData(); } diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxUserDataRule.java b/mallinkService/src/main/java/com/iformall/domain/po/WxUserDataRule.java index 013cc3df8..ae82d2dd0 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxUserDataRule.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxUserDataRule.java @@ -51,5 +51,13 @@ public class WxUserDataRule extends TenantEntity { }*/ return null; } + + public String getShopTypes() { + if (StringUtils.isNotEmpty(shopType)) { + Object[] data = JSONArray.parseArray(shopType).toArray(); + return StringUtils.join(data, ","); + } + return null; + } }