From 857cb5b77e4ed71324b024ee6947ae923caee73e Mon Sep 17 00:00:00 2001 From: furunxin <864795252@qq.com> Date: Fri, 24 Jul 2020 15:15:15 +0800 Subject: [PATCH] =?UTF-8?q?=E5=90=88=E5=90=8C=E7=BB=AD=E7=AD=BE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/WxMerchantServiceImpl.java | 56 +++++++++---------- 1 file changed, 28 insertions(+), 28 deletions(-) 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 6db5a2720..aff28b0d6 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; }