|
|
|
@@ -98,6 +98,22 @@ public class WxMerchantServiceImpl implements WxMerchantService { |
|
|
|
merchant.setRentalStartDate(collect.get(0).getRentalStartDate()); |
|
|
|
merchant.setRentalEndDate(collect.get(0).getRentalEndDate()); |
|
|
|
} |
|
|
|
if (record.getRentShopType() != null) { |
|
|
|
WxMerchantShop wxMerchantShop = new WxMerchantShop(); |
|
|
|
wxMerchantShop.setMerchantId(merchant.getId()); |
|
|
|
wxMerchantShop.setIsDel(EnumDelStatus.NOT_DEL.getCode()); |
|
|
|
List<Map<String, Object>> shops = new ArrayList<>(); |
|
|
|
List<WxMerchantShop> wxMerchantShopList = wxMerchantShopMapper.findList(wxMerchantShop); |
|
|
|
for (WxMerchantShop merchantShop : wxMerchantShopList) { |
|
|
|
WxShop shop = new WxShop(); |
|
|
|
record.setId(merchantShop.getShopId()); |
|
|
|
List<Map<String, Object>> shoplist = wxShopMapper.findListMap(shop); |
|
|
|
if (shoplist.size() > 0) { |
|
|
|
shops.add(shoplist.get(0)); |
|
|
|
} |
|
|
|
} |
|
|
|
merchant.setShoplist(shops); |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
PageInfo<WxMerchant> pageInfo = new PageInfo<>(merchants); |
|
|
|
|