From cef68e43d90c9a5195b0ba77fcc065336a73363d Mon Sep 17 00:00:00 2001 From: winter <664946893@qq.com> Date: Wed, 20 Nov 2024 21:55:09 +0800 Subject: [PATCH] fix --- .../iformall/domain/po/WxRentContract.java | 2 + .../impl/WxRentContractServiceImpl.java | 43 +++++++++++++++++++ 2 files changed, 45 insertions(+) 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 c8f654505..cd28f5bd2 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxRentContract.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxRentContract.java @@ -568,5 +568,7 @@ public class WxRentContract extends TenantEntity { private Date salesStartTime; @TableField(exist = false) private Date salesEndTime; + @TableField(exist = false) + private String merchantName; } 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 11895b139..cd93c18f5 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java @@ -1706,8 +1706,51 @@ public class WxRentContractServiceImpl implements WxRentContractService { } //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()+"/"; + } + } + merchantName = merchantName + contract.getRentInfoShopNumber(); + contract.setMerchantName(merchantName); + } + + } return pageInfo; } + + private Map getContractCustomersMap(TenantEntity tenantEntity,List customerIds) { + 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})