From 6967f9135b39843ab8275010b3887d65e92ead10 Mon Sep 17 00:00:00 2001 From: winter <664946893@qq.com> Date: Thu, 22 May 2025 16:02:32 +0800 Subject: [PATCH] fix --- .../contract/WxRentContractController.java | 9 +- .../iformall/domain/po/WxRentContract.java | 2 + .../service/WxRentContractService.java | 2 +- .../impl/WxRentContractServiceImpl.java | 171 +++++++++--------- 4 files changed, 91 insertions(+), 93 deletions(-) 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 37f24db2b..10c2bf818 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/contract/WxRentContractController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/contract/WxRentContractController.java @@ -258,6 +258,12 @@ public class WxRentContractController extends WxContractBaseController { @ApiImplicitParam(name = "pageSize", value = "每页条数", dataType = "int", paramType = "query", required = true)}) public ResultData getRevenueContractList(@ModelAttribute WxRentContract wxRentContract, Integer pageNum, Integer pageSize) { if (null == wxRentContract) wxRentContract = new WxRentContract(); + WxUserDataRule dataRule = this.getCurrentDataFloors(); + if (null != dataRule) { + wxRentContract.setFloorForRule(dataRule.getFloorIds()); + wxRentContract.setBusinessForRule(dataRule.getBussinessIds()); + wxRentContract.setShopTypeForRule(dataRule.getShopTypes()); + } wxRentContract.updateTenantInfo(getTenantInfo()); List typeList = new ArrayList(); typeList.add(EnumRentContractType.RENT_BY_JOINT.getCode()); @@ -269,8 +275,7 @@ public class WxRentContractController extends WxContractBaseController { //statusList.add(EnumRentContractStatus.READY_FOR_PAING.getCode()); wxRentContract.setStatuss(statusList); wxRentContract.setSortColumns(SortField.Createtime_DESC); - //return new ResultData(wxRentContractService.getRentContractList(wxRentContract, pageNum, pageSize)); - return new ResultData(); + return new ResultData(wxRentContractService.getRenevueContractList(wxRentContract, pageNum, pageSize)); } //查询联营扣点,联营取高的合同账单周期 diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxRentContract.java b/mallinkService/src/main/java/com/iformall/domain/po/WxRentContract.java index e46c23fb5..8d28f9727 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxRentContract.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxRentContract.java @@ -372,5 +372,7 @@ public class WxRentContract extends TenantEntity { private List calcuteShopIds; @TableField(exist = false) private Integer calcuteIsProperty; + @TableField(exist = false) + private String shopNumber; } diff --git a/mallinkService/src/main/java/com/iformall/service/WxRentContractService.java b/mallinkService/src/main/java/com/iformall/service/WxRentContractService.java index c7067908d..6b61b374c 100644 --- a/mallinkService/src/main/java/com/iformall/service/WxRentContractService.java +++ b/mallinkService/src/main/java/com/iformall/service/WxRentContractService.java @@ -80,7 +80,7 @@ public interface WxRentContractService { ResultData updateRentContract(WxRentContract wxRentContract); - //PageInfo getRentContractList(WxRentContract rentContract, Integer pageNum, Integer pageSize); + PageInfo getRenevueContractList(WxRentContract rentContract, Integer pageNum, Integer pageSize); //void exportContract(HttpServletRequest request, HttpServletResponse response, Long rentId,Long propertyId); diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java index 31b0a829c..209c44f41 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java @@ -64,6 +64,7 @@ import com.iformall.enums.EnumRentContractType; import com.iformall.enums.EnumRentDayPriceCalcute; import com.iformall.enums.EnumRentShopType; import com.iformall.enums.EnumRentStartType; +import com.iformall.enums.EnumShopStatus; import com.iformall.enums.EnumShopUsersStatus; import com.iformall.enums.EnumShopUsersType; import com.iformall.enums.EnumSystemUserType; @@ -1524,96 +1525,86 @@ public class WxRentContractServiceImpl implements WxRentContractService { return new ResultData(Result.SUCCESS, "操作成功"); } -// @Override -// public PageInfo getRentContractList(WxRentContract rentContract, Integer pageIndex, Integer pageSize) { -// if (StringUtils.isNotBlank(rentContract.getFloorForRule()) || StringUtils.isNotBlank(rentContract.getQueryShopIdStr())) { -// List shopIdList = null; -// if (StringUtils.isNotBlank(rentContract.getQueryShopIdStr())) { -// String[] qsids = rentContract.getQueryShopIdStr().split(","); -// if (null != qsids && qsids.length > 0 ) { -// shopIdList = new ArrayList(); -// for (int i = 0 ; i < qsids.length ; i ++) { -// String qsid = qsids[i]; -// if (StringUtils.isNotBlank(qsid)) { -// shopIdList.add(Long.parseLong(qsid)); -// } -// } -// if (shopIdList.size() <= 0 ) { -// shopIdList = null; -// } -// } -// } -// -// List contractIds = wxAgileContractService.findBuildingFloorContractIds(rentContract, rentContract.getFloorForRule(), null, null, shopIdList, 0); -// //List mids = wxMerchantService.getFloorBuildMerchantIds(rentContract, rentContract.getFloorForRule() , null, null,rentContract.getShopTypeForRule(), 0, 0,null); -// if (null == contractIds || contractIds.size() <= 0 ) { -// rentContract.setId(-1L); -// } else { -// rentContract.setIds(contractIds); -// } -// } -// //根据客户名称查询 -// if (StringUtils.isNotBlank(rentContract.getMerchantName())) { -// WxContractCustomers ccq = new WxContractCustomers(); -// ccq.updateTenantInfo(rentContract); -// ccq.setName(rentContract.getMerchantName()); -// List customersIdList = wxContractCustomersMapper.findIdList(ccq); -// if (null != customersIdList && customersIdList.size() > 0 ) { -// rentContract.setCustomersIdList(customersIdList); -// }else { -// rentContract.setId(-1L); -// } -// } -// -// //PageInfo pageInfo = PageHelper.startPage(pageIndex, pageSize).doSelectPageInfo(() -> wxRentContractMapper.getRentContractList(rentContract)); -// PageInfo pageInfo = PageHelper.startPage(pageIndex, pageSize).doSelectPageInfo(() -> wxRentContractMapper.findList(rentContract)); -// if (null != pageInfo && null != pageInfo.getList()) { -// List customersIdList = new ArrayList(); -// for (int i = 0 ; i < pageInfo.getList().size(); i ++ ){ -// WxRentContract contract = pageInfo.getList().get(i); -// if (null != contract.getCustomersId()) { -// customersIdList.add(contract.getCustomersId()); -// } -// } -// -// Map customersMap = getContractCustomersMap(rentContract,customersIdList); -// -// for (int i = 0 ; i < pageInfo.getList().size(); i ++ ) { -// WxRentContract contract = pageInfo.getList().get(i); -// String merchantName = ""; -// if (null != customersMap && null != contract.getCustomersId()) { -// WxContractCustomers cc = customersMap.get(contract.getCustomersId()); -// if (null != cc) { -// merchantName = merchantName + cc.getName(); -// } -// } -// contract.setMerchantName(merchantName); -// } -// -// } -// return pageInfo; -// } -// -// private Map getContractCustomersMap(TenantEntity tenantEntity,List customerIds) { -// if (null == customerIds || customerIds.size() <= 0 ) { -// return null; -// } -// WxContractCustomers ccq = new WxContractCustomers(); -// ccq.updateTenantInfo(tenantEntity); -// ccq.setIds(customerIds); -// List cclist = wxContractCustomersMapper.findList(ccq); -// if (null != cclist && cclist.size() > 0 ){ -// Map map = new HashMap(); -// for (int i = 0 ; i < cclist.size() ; i ++ ) { -// WxContractCustomers cc = cclist.get(i); -// if (null != cc) { -// map.put(cc.getId(),cc); -// } -// } -// return map; -// } -// return null; -// } + @Override + public PageInfo getRenevueContractList(WxRentContract rentContract, Integer pageIndex, Integer pageSize) { + if (StringUtils.isNotBlank(rentContract.getFloorForRule()) || StringUtils.isNotBlank(rentContract.getShopNumber())) { + List shopIdList = null; + if (StringUtils.isNotBlank(rentContract.getShopNumber())) { + WxShop sq = new WxShop(); + sq.updateTenantInfo(rentContract); + sq.setShopNumber(rentContract.getShopNumber()); + sq.setIsDel(EnumYesOrNo.NO.getCode()); + shopIdList = wxShopMapper.findIdList(sq); + } + + List contractIds = wxAgileContractService.findBuildingFloorContractIds(rentContract, rentContract.getFloorForRule(), null, null, shopIdList, 0); + if (null == contractIds || contractIds.size() <= 0 ) { + rentContract.setId(-1L); + } else { + rentContract.setIds(contractIds); + } + } + //根据客户名称查询 + if (StringUtils.isNotBlank(rentContract.getMerchantName())) { + WxContractCustomers ccq = new WxContractCustomers(); + ccq.updateTenantInfo(rentContract); + ccq.setName(rentContract.getMerchantName()); + List customersIdList = wxContractCustomersMapper.findIdList(ccq); + if (null != customersIdList && customersIdList.size() > 0 ) { + rentContract.setCustomersIdList(customersIdList); + }else { + rentContract.setId(-1L); + } + } + + PageInfo pageInfo = PageHelper.startPage(pageIndex, pageSize).doSelectPageInfo(() -> wxRentContractMapper.findList(rentContract)); + if (null != pageInfo && null != pageInfo.getList()) { + List customersIdList = new ArrayList(); + for (int i = 0 ; i < pageInfo.getList().size(); i ++ ){ + WxRentContract contract = pageInfo.getList().get(i); + if (null != contract.getCustomersId()) { + customersIdList.add(contract.getCustomersId()); + } + } + + Map customersMap = getContractCustomersMap(rentContract,customersIdList); + + for (int i = 0 ; i < pageInfo.getList().size(); i ++ ) { + WxRentContract contract = pageInfo.getList().get(i); + String merchantName = ""; + if (null != customersMap && null != contract.getCustomersId()) { + WxContractCustomers cc = customersMap.get(contract.getCustomersId()); + if (null != cc) { + merchantName = merchantName + cc.getName(); + } + } + contract.setMerchantName(merchantName); + } + + } + return pageInfo; + } + + private Map getContractCustomersMap(TenantEntity tenantEntity,List customerIds) { + if (null == customerIds || customerIds.size() <= 0 ) { + return null; + } + WxContractCustomers ccq = new WxContractCustomers(); + ccq.updateTenantInfo(tenantEntity); + ccq.setIds(customerIds); + List cclist = wxContractCustomersMapper.findList(ccq); + if (null != cclist && cclist.size() > 0 ){ + Map map = new HashMap(); + for (int i = 0 ; i < cclist.size() ; i ++ ) { + WxContractCustomers cc = cclist.get(i); + if (null != cc) { + map.put(cc.getId(),cc); + } + } + return map; + } + return null; + } // @Override // @Transactional(rollbackFor = {Exception.class})