From 93a251097ca7f568f9064d0f7c823a32b509c2e4 Mon Sep 17 00:00:00 2001 From: winter Date: Mon, 23 Sep 2024 15:31:45 +0800 Subject: [PATCH] fix --- .../basic/WxMallBuildingController.java | 16 ++++++++++------ .../contract/WxRentContractController.java | 10 +++++++--- .../com/iformall/domain/po/WxMallBuilding.java | 3 +++ .../impl/WxPropertyContractServiceImpl.java | 1 + 4 files changed, 21 insertions(+), 9 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 4bbe434e5..b5260cd74 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/basic/WxMallBuildingController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/basic/WxMallBuildingController.java @@ -8,6 +8,7 @@ import com.iformall.controller.base.BaseController; import com.iformall.domain.po.WxMallBuilding; import com.iformall.domain.po.WxMallFloor; import com.iformall.domain.po.WxUserDataRule; +import com.iformall.enums.EnumYesOrNo; import com.iformall.service.WxMallBuildingService; import com.iformall.utils.Constant; import com.iformall.utils.RedisCacheUtils; @@ -37,12 +38,15 @@ public class WxMallBuildingController extends BaseController { @GetMapping("getbuildingfloorlist") public ResultData getbuildingfloorlist(WxMallBuilding wxMallBuilding) { wxMallBuilding.updateTenantInfo(getTenantInfo()); - WxUserDataRule dataRule = this.getCurrentDataFloors(); - if (null != dataRule) { - wxMallBuilding.setFloorForRule(dataRule.getFloorIds()); - wxMallBuilding.setBusinessForRule(dataRule.getBussinessIds()); - wxMallBuilding.setShopTypeForRule(dataRule.getShopTypes()); - } + if (null != wxMallBuilding.getIsAll() && wxMallBuilding.getIsAll()==EnumYesOrNo.YES.getCode()) { + }else { + WxUserDataRule dataRule = this.getCurrentDataFloors(); + if (null != dataRule) { + wxMallBuilding.setFloorForRule(dataRule.getFloorIds()); + wxMallBuilding.setBusinessForRule(dataRule.getBussinessIds()); + wxMallBuilding.setShopTypeForRule(dataRule.getShopTypes()); + } + } return wxMallBuildingService.getBuildingFloorList(wxMallBuilding,this.getUser()); } 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 bc092de42..7ddcaefd0 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/contract/WxRentContractController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/contract/WxRentContractController.java @@ -335,14 +335,16 @@ public class WxRentContractController extends WxContractBaseController { */ @GetMapping("getXuQianRentContract") @ApiImplicitParams({}) - public ResultData getRentContractList(@ModelAttribute WxRentContract wxRentContract) { - logger.debug("[" + getIpAddr() + "] WxRentContractController::getRentContractList"); + public ResultData getXuQianRentContract(@ModelAttribute WxRentContract wxRentContract) { wxRentContract.updateTenantInfo(getTenantInfo()); List statss = new ArrayList(); statss.add(EnumRentContractStatus.PAING.getCode()); statss.add(EnumRentContractStatus.OUT_DATE.getCode()); wxRentContract.setStatuss(statss); wxRentContract.setSortColumn(BaseEntity.SortField.Createtime_DESC.getValue()); + if (null == wxRentContract.getIsPrivateMerchant()) { + wxRentContract.setIsPrivateMerchant(EnumYesOrNo.NO.getCode()); + } PageInfo page = wxRentContractService.getRentContractList(wxRentContract, 1, 100000); if (null != page && null != page.getList()) { List> retList = new ArrayList>(); @@ -650,7 +652,9 @@ public class WxRentContractController extends WxContractBaseController { wxRentContract.setStatuss(statuss); } } - + if (null == wxRentContract.getIsPrivateMerchant()) { + wxRentContract.setIsPrivateMerchant(EnumYesOrNo.NO.getCode()); + } wxRentContract.setSortColumns(SortField.Createtime_DESC); return new ResultData(wxRentContractService.getRentContractList(wxRentContract, pageNum, pageSize)); } diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxMallBuilding.java b/mallinkService/src/main/java/com/iformall/domain/po/WxMallBuilding.java index eec2b8d55..3040da535 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxMallBuilding.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxMallBuilding.java @@ -44,4 +44,7 @@ public class WxMallBuilding extends TenantEntity { this.buildingName = buildingName; this.name = buildingName; } + + @TableField(exist = false) + private Integer isAll; } diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxPropertyContractServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxPropertyContractServiceImpl.java index 0fbfb8de1..017e9aa5e 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxPropertyContractServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxPropertyContractServiceImpl.java @@ -562,6 +562,7 @@ public class WxPropertyContractServiceImpl implements WxPropertyContractService // wxBillDeposit.setEndtime(instance.getTime()); wxBillDeposit.setEndtime(record.getFirstBillDateEnd()); wxBillDeposit.setReceiveDate(record.getFirstBillReceiveDate()); + wxBillDeposit.setPeriod(WxRentContractHelper.getPeriod(record.getFirstBillReceiveDate())); wxBillDeposit.updateTenantInfo(wxPropertyContract); wxBillDeposit.setMerchantId(record.getMerchantId()); wxBillDeposit.setCreatetime(date);