|
|
@@ -74,7 +74,7 @@ public class WxMerchantServiceImpl implements WxMerchantService { |
|
|
List<WxMerchantShop> wxMerchantShopList = wxMerchantShopMapper.findList(wxMerchantShop); |
|
|
List<WxMerchantShop> wxMerchantShopList = wxMerchantShopMapper.findList(wxMerchantShop); |
|
|
for(WxMerchantShop merchantShop:wxMerchantShopList){ |
|
|
for(WxMerchantShop merchantShop:wxMerchantShopList){ |
|
|
wxMerchant.setRentalStartDate(merchantShop.getRentalStartDate()); |
|
|
wxMerchant.setRentalStartDate(merchantShop.getRentalStartDate()); |
|
|
wxMerchant.setRentalEndDate(merchantShop.getRentalStartDate()); |
|
|
|
|
|
|
|
|
wxMerchant.setRentalEndDate(merchantShop.getRentalEndDate()); |
|
|
WxShop wxShop = WxShopMapper.selectByPrimaryKey(merchantShop.getShopId()); |
|
|
WxShop wxShop = WxShopMapper.selectByPrimaryKey(merchantShop.getShopId()); |
|
|
if(wxShop!=null) |
|
|
if(wxShop!=null) |
|
|
shops.add(wxShop); |
|
|
shops.add(wxShop); |
|
|
|