| @@ -61,15 +61,18 @@ public class WxMerchantServiceImpl implements WxMerchantService { | |||||
| @Override | @Override | ||||
| public PageInfo<WxMerchant> listAsPage(WxMerchant record, Integer pageIndex, Integer pageSize) { | public PageInfo<WxMerchant> listAsPage(WxMerchant record, Integer pageIndex, Integer pageSize) { | ||||
| WxMerchantShop merchantShop = new WxMerchantShop(); | |||||
| merchantShop.setTenantId(record.getTenantId()); | |||||
| merchantShop.setIsDel(EnumDelStatus.NOT_DEL.getCode()); | |||||
| List<WxMerchantShop> merchantShops = wxMerchantShopMapper.findList(merchantShop); | |||||
| WxRentContract wxRentContract = new WxRentContract(); | |||||
| wxRentContract.setTenantId(record.getTenantId()); | |||||
| List<WxRentContract> list = wxRentContractMapper.findList(wxRentContract); | |||||
| PageHelper.startPage(pageIndex, pageSize); | PageHelper.startPage(pageIndex, pageSize); | ||||
| List<WxMerchant> merchants = wxMerchantMapper.findList(record); | List<WxMerchant> merchants = wxMerchantMapper.findList(record); | ||||
| for (WxMerchant merchant : merchants) { | for (WxMerchant merchant : merchants) { | ||||
| List<WxMerchantShop> collect = merchantShops.stream().filter(ms -> ms.getMerchantId().equals(merchant.getId())).collect(Collectors.toList()); | |||||
| List<WxRentContract> collect = list.stream().filter(ms -> ms.getMerchantId()!=null && ms.getMerchantId().equals(merchant.getId()) | |||||
| && !ms.getStatus().equals(EnumRentContractStatus.WAIT_SIGN.getCode()) | |||||
| && !ms.getStatus().equals(EnumRentContractStatus.CONTRACT_TERMINATE.getCode())).collect(Collectors.toList()); | |||||
| if (collect != null && collect.size() > 0) { | if (collect != null && collect.size() > 0) { | ||||
| merchant.setRentalStartDate(collect.get(0).getRentalStartDate()); | merchant.setRentalStartDate(collect.get(0).getRentalStartDate()); | ||||
| merchant.setRentalEndDate(collect.get(0).getRentalEndDate()); | merchant.setRentalEndDate(collect.get(0).getRentalEndDate()); | ||||