From ac641ba74ba530c785b62c1932c754ce267e2497 Mon Sep 17 00:00:00 2001 From: xiaohanzi Date: Mon, 31 Aug 2020 15:25:09 +0800 Subject: [PATCH 1/3] fix bug --- mallinkAdmin/src/main/resources/application-prod.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 From fd87dc5b2bbfd85e942ada30cc40748720adedd9 Mon Sep 17 00:00:00 2001 From: xiaohanzi Date: Mon, 31 Aug 2020 16:45:42 +0800 Subject: [PATCH 2/3] fix contract bug --- .../java/com/iformall/service/impl/WxMerchantServiceImpl.java | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) 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..1af62e28b 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxMerchantServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxMerchantServiceImpl.java @@ -484,9 +484,8 @@ public class WxMerchantServiceImpl implements WxMerchantService { //都验证过了之后,先把之前的商铺释放,删除关系 if (null != oldShopIds && oldShopIds.size() > 0 ) { wxShopMapper.updateUnRentByIds(oldShopIds); - wxMerchantShopMapper.realDelByMerchantId(wxMerchant.getId()); } - + wxMerchantShopMapper.realDelByMerchantId(wxMerchant.getId()); if (null != shopIds) { for (Long sid: shopIds) { WxMerchantShop mcs = new WxMerchantShop(); From d724c2d8451f2dde3ae15335b83373ca6ccc29af Mon Sep 17 00:00:00 2001 From: xiaohanzi Date: Mon, 31 Aug 2020 16:50:18 +0800 Subject: [PATCH 3/3] fix contract bug --- .../service/impl/WxMerchantServiceImpl.java | 36 +++++++++---------- 1 file changed, 18 insertions(+), 18 deletions(-) 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 1af62e28b..eb727a185 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxMerchantServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxMerchantServiceImpl.java @@ -464,10 +464,6 @@ public class WxMerchantServiceImpl implements WxMerchantService { //如果原来店铺在商户里面有有效的合同,则不能操作 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()); @@ -487,21 +483,25 @@ public class WxMerchantServiceImpl implements WxMerchantService { } wxMerchantShopMapper.realDelByMerchantId(wxMerchant.getId()); if (null != shopIds) { + List currSIds = new ArrayList(); for (Long sid: shopIds) { - WxMerchantShop mcs = new WxMerchantShop(); - mcs.setMerchantId(wxMerchant.getId()); - mcs.setShopId(sid); - mcs.setIsDel(EnumDelStatus.NOT_DEL.getCode()); - mcs.setId(idWorker.nextId()); - mcs.updateTenantInfo(wxMerchant); - Date shopdate = new Date(); - mcs.setUpdateDate(shopdate); - mcs.setCreateDate(shopdate); - wxMerchantShopMapper.insert(mcs); - //更新商铺状态 - WxShop sh = wxShopMapper.selectById(sid); - sh.setStatus(EnumShopStatus.RENT.getCode()); - wxShopMapper.updateById(sh); + if (!currSIds.contains(sid)) { + WxMerchantShop mcs = new WxMerchantShop(); + mcs.setMerchantId(wxMerchant.getId()); + mcs.setShopId(sid); + mcs.setIsDel(EnumDelStatus.NOT_DEL.getCode()); + mcs.setId(idWorker.nextId()); + mcs.updateTenantInfo(wxMerchant); + Date shopdate = new Date(); + mcs.setUpdateDate(shopdate); + mcs.setCreateDate(shopdate); + wxMerchantShopMapper.insert(mcs); + //更新商铺状态 + WxShop sh = wxShopMapper.selectById(sid); + sh.setStatus(EnumShopStatus.RENT.getCode()); + wxShopMapper.updateById(sh); + currSIds.add(sid); + } } } return new ResultData(Result.SUCCESS, "商户更新成功");