|
|
|
@@ -485,10 +485,7 @@ public class WxMerchantServiceImpl implements WxMerchantService { |
|
|
|
if (null != oldShopIds && oldShopIds.size() > 0 ) { |
|
|
|
wxShopMapper.updateUnRentByIds(oldShopIds); |
|
|
|
wxMerchantShopMapper.realDelByMerchantId(wxMerchant.getId()); |
|
|
|
} |
|
|
|
|
|
|
|
if (null != shopIds) { |
|
|
|
for (Long sid: shopIds) { |
|
|
|
for (Long sid: oldShopIds) { |
|
|
|
WxMerchantShop mcs = new WxMerchantShop(); |
|
|
|
mcs.setMerchantId(wxMerchant.getId()); |
|
|
|
mcs.setShopId(sid); |
|
|
|
@@ -505,6 +502,8 @@ public class WxMerchantServiceImpl implements WxMerchantService { |
|
|
|
wxShopMapper.updateById(sh); |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
return new ResultData(Result.SUCCESS, "商户更新成功"); |
|
|
|
} catch (Exception e) { |
|
|
|
logger.error("db failed: 商户更新失败, e:" + e.getMessage()); |
|
|
|
|