|
|
@@ -69,6 +69,7 @@ public class WxMerchantServiceImpl implements WxMerchantService { |
|
|
merchant.setRentalEndDate(collect.get(0).getRentalEndDate()); |
|
|
merchant.setRentalEndDate(collect.get(0).getRentalEndDate()); |
|
|
} |
|
|
} |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
PageInfo<WxMerchant> pageInfo = new PageInfo<>(merchants); |
|
|
PageInfo<WxMerchant> pageInfo = new PageInfo<>(merchants); |
|
|
return pageInfo; |
|
|
return pageInfo; |
|
|
} |
|
|
} |
|
|
@@ -103,8 +104,9 @@ public class WxMerchantServiceImpl implements WxMerchantService { |
|
|
WxShop record = new WxShop(); |
|
|
WxShop record = new WxShop(); |
|
|
record.setId(merchantShop.getShopId()); |
|
|
record.setId(merchantShop.getShopId()); |
|
|
List<Map<String,Object>> shoplist = wxShopMapper.findListMap(record); |
|
|
List<Map<String,Object>> shoplist = wxShopMapper.findListMap(record); |
|
|
if(shoplist.size()>0) |
|
|
|
|
|
|
|
|
if(shoplist.size()>0) { |
|
|
shops.add(shoplist.get(0)); |
|
|
shops.add(shoplist.get(0)); |
|
|
|
|
|
} |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
wxMerchant.setShoplist(shops); |
|
|
wxMerchant.setShoplist(shops); |
|
|
|