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 aff28b0d6..6db5a2720 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxMerchantServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxMerchantServiceImpl.java @@ -730,34 +730,34 @@ public class WxMerchantServiceImpl implements WxMerchantService { public PageInfo listVoAsPage(WxMerchant record, Integer pageIndex, Integer pageSize) { PageHelper.startPage(pageIndex, pageSize); List merchants = wxMerchantMapper.findListVo(record); -// for (WxMerchant merchant : merchants) { -// if (record.getRentShopType() != null) { -// List> shops = new ArrayList<>(); -// WxMerchantShop wxMerchantShop = new WxMerchantShop(); -// wxMerchantShop.setMerchantId(merchant.getId()); -// wxMerchantShop.setIsDel(EnumDelStatus.NOT_DEL.getCode()); -// List wxMerchantShopList = wxMerchantShopMapper.findList(wxMerchantShop); -// for (WxMerchantShop merchantShop : wxMerchantShopList) { -// WxShop shop = new WxShop(); -// shop.setId(merchantShop.getShopId()); -// List> shoplist = wxShopMapper.findListMap(shop); -// if (shoplist.size() > 0) { -// shops.add(shoplist.get(0)); -// } -// } -// merchant.setShoplist(shops); -// } -// -// WxRentContract rc = new WxRentContract(); -// rc.setMerchantId(merchant.getId()); -// rc.setTenantId(merchant.getTenantId()); -// List rentContractList = wxRentContractMapper.findList(rc); -// if(CollectionUtils.isEmpty(rentContractList)){ -// merchant.setHasContract(EnumHasContract.NO.getCode()); -// }else{ -// merchant.setHasContract(EnumHasContract.HAS.getCode()); -// } -// } + for (WxMerchant merchant : merchants) { + if (record.getRentShopType() != null) { + List> shops = new ArrayList<>(); + WxMerchantShop wxMerchantShop = new WxMerchantShop(); + wxMerchantShop.setMerchantId(merchant.getId()); + wxMerchantShop.setIsDel(EnumDelStatus.NOT_DEL.getCode()); + List wxMerchantShopList = wxMerchantShopMapper.findList(wxMerchantShop); + for (WxMerchantShop merchantShop : wxMerchantShopList) { + WxShop shop = new WxShop(); + shop.setId(merchantShop.getShopId()); + List> shoplist = wxShopMapper.findListMap(shop); + if (shoplist.size() > 0) { + shops.add(shoplist.get(0)); + } + } + merchant.setShoplist(shops); + } + + WxRentContract rc = new WxRentContract(); + rc.setMerchantId(merchant.getId()); + rc.setTenantId(merchant.getTenantId()); + List rentContractList = wxRentContractMapper.findList(rc); + if(CollectionUtils.isEmpty(rentContractList)){ + merchant.setHasContract(EnumHasContract.NO.getCode()); + }else{ + merchant.setHasContract(EnumHasContract.HAS.getCode()); + } + } PageInfo pageInfo = new PageInfo<>(merchants); return pageInfo; }