diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxMerchantServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxMerchantServiceImpl.java index c17f9695c..25559d9fd 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxMerchantServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxMerchantServiceImpl.java @@ -88,20 +88,19 @@ public class WxMerchantServiceImpl implements WxMerchantService { @Override public PageInfo listAsPage(WxMerchant record, Integer pageIndex, Integer pageSize) { - WxRentContract wxRentContract = new WxRentContract(); - wxRentContract.setTenantId(record.getTenantId()); - List list = wxRentContractMapper.findList(wxRentContract); + PageHelper.startPage(pageIndex, pageSize); List merchants = wxMerchantMapper.findList(record); for (WxMerchant merchant : merchants) { - List 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()) - && !ms.getStatus().equals(EnumRentContractStatus.INTENTION.getCode())).collect(Collectors.toList()); - if (collect != null && collect.size() > 0) { - merchant.setRentalStartDate(collect.get(0).getRentalStartDate()); - merchant.setRentalEndDate(collect.get(0).getRentalEndDate()); + + WxRentContract wxRentContract = new WxRentContract(); + wxRentContract.setMerchantId(merchant.getId()); + List lrc = wxRentContractMapper.selectRentContractByMerchantId(wxRentContract); + if (!lrc.isEmpty()) { + merchant.setRentalStartDate(lrc.get(0).getRentalStartDate()); + merchant.setRentalEndDate(lrc.get(0).getRentalEndDate()); } + if (record.getRentShopType() != null) { List> shops = new ArrayList<>(); WxMerchantShop wxMerchantShop = new WxMerchantShop(); diff --git a/mallinkService/src/main/resources/mapper/WxRentContractMapper.xml b/mallinkService/src/main/resources/mapper/WxRentContractMapper.xml index 6eed8483a..7453c3f99 100644 --- a/mallinkService/src/main/resources/mapper/WxRentContractMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxRentContractMapper.xml @@ -244,7 +244,7 @@