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 d1412ea39..64b4d4479 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxMerchantServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxMerchantServiceImpl.java @@ -460,9 +460,14 @@ public class WxMerchantServiceImpl implements WxMerchantService { Date date = new Date(); wxMerchant.setUpdateDate(date); wxMerchantMapper.updateById(wxMerchant); + List shopIds = wxMerchant.getShopids(); //如果原来店铺在商户里面有有效的合同,则不能操作 List oldShopIds = wxMerchantShopMapper.findShopIds(wxMerchant.getId()); if (null != oldShopIds && oldShopIds.size() > 0) { + if(null != shopIds) { + //去重 + oldShopIds.removeAll(shopIds); + } for (Long osid : oldShopIds) { WxRentContract wrc = new WxRentContract(); wrc.setMerchantId(wxMerchant.getId()); @@ -481,7 +486,7 @@ public class WxMerchantServiceImpl implements WxMerchantService { wxShopMapper.updateUnRentByIds(oldShopIds); wxMerchantShopMapper.realDelByMerchantId(wxMerchant.getId()); } - List shopIds = wxMerchant.getShopids(); + if (null != shopIds) { for (Long sid: shopIds) { WxMerchantShop mcs = new WxMerchantShop();