From 10c42a2b6b8b98f6c6178117cf1a298e2fcf924f Mon Sep 17 00:00:00 2001 From: xiaohanzi Date: Mon, 31 Aug 2020 16:35:40 +0800 Subject: [PATCH] fix contract bug --- mallinkAdmin/src/main/resources/application-prod.yml | 2 +- .../com/iformall/service/impl/WxMerchantServiceImpl.java | 7 +++---- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/mallinkAdmin/src/main/resources/application-prod.yml b/mallinkAdmin/src/main/resources/application-prod.yml index ac35f6f34..863bf49f0 100644 --- a/mallinkAdmin/src/main/resources/application-prod.yml +++ b/mallinkAdmin/src/main/resources/application-prod.yml @@ -54,7 +54,7 @@ spring: keysecret: VfWqGb83qIQrS9us45utskl8itd7ry bucketname: formall filehost: malinkadmin - filedomain: https://formall.oss-cn-beijing.aliyuncs.com + filedomain: https://formall.oss-accelerate.aliyuncs.com # EMAIL mail: host: smtp.exmail.qq.com 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 64b4d4479..4a199e22e 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxMerchantServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxMerchantServiceImpl.java @@ -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());