From 85c85b480b2b482d5abff2b764275934c0d4bebe Mon Sep 17 00:00:00 2001 From: xhxu Date: Fri, 4 Sep 2020 23:22:22 +0800 Subject: [PATCH 1/2] update --- .../service/impl/WxMerchantServiceImpl.java | 94 ++++++++++--------- 1 file changed, 48 insertions(+), 46 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 08c209f92..8c1ca9ecd 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxMerchantServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxMerchantServiceImpl.java @@ -461,54 +461,56 @@ public class WxMerchantServiceImpl implements WxMerchantService { wxMerchant.setUpdateDate(date); wxMerchantMapper.updateById(wxMerchant); List shopIds = wxMerchant.getShopids(); - //如果原来店铺在商户里面有有效的合同,则不能操作 - List oldShopIds = wxMerchantShopMapper.findShopIds(wxMerchant.getId()); - List coldShopIds = new ArrayList(); - if (null != oldShopIds && oldShopIds.size() > 0) { - coldShopIds.addAll(oldShopIds); - oldShopIds.removeAll(shopIds); - if (null != oldShopIds && oldShopIds.size() > 0 ) { - for (Long osid : oldShopIds) { - WxRentContract wrc = new WxRentContract(); - wrc.setMerchantId(wxMerchant.getId()); - wrc.setQueryShopId(osid); - wrc.setStatuss(EnumRentContractStatus.getValidStatus()); - wrc.updateTenantInfo(wxMerchant); - List clist = wxRentContractService.findList(wrc); - if (null != clist && clist.size() > 0 ) { - return new ResultData(ErrorCode.MERCHANT_HASRENTCONTRACT.getCode(),"店铺["+osid+"]存在有效的合同,不能解除绑定."); - } - } - //都验证过了之后,先把之前的商铺释放,删除关系 - wxShopMapper.updateUnRentByIds(oldShopIds); - wxMerchantShopMapper.realDelByMerchantId(wxMerchant.getId(),oldShopIds); + if(null != shopIds && shopIds.size() > 0){ + //如果原来店铺在商户里面有有效的合同,则不能操作 + List oldShopIds = wxMerchantShopMapper.findShopIds(wxMerchant.getId()); + List coldShopIds = new ArrayList(); + if (null != oldShopIds && oldShopIds.size() > 0) { + coldShopIds.addAll(oldShopIds); + oldShopIds.removeAll(shopIds); + if (null != oldShopIds && oldShopIds.size() > 0 ) { + for (Long osid : oldShopIds) { + WxRentContract wrc = new WxRentContract(); + wrc.setMerchantId(wxMerchant.getId()); + wrc.setQueryShopId(osid); + wrc.setStatuss(EnumRentContractStatus.getValidStatus()); + wrc.updateTenantInfo(wxMerchant); + List clist = wxRentContractService.findList(wrc); + if (null != clist && clist.size() > 0 ) { + return new ResultData(ErrorCode.MERCHANT_HASRENTCONTRACT.getCode(),"店铺["+osid+"]存在有效的合同,不能解除绑定."); + } + } + //都验证过了之后,先把之前的商铺释放,删除关系 + wxShopMapper.updateUnRentByIds(oldShopIds); + wxMerchantShopMapper.realDelByMerchantId(wxMerchant.getId(),oldShopIds); + } + } + + if (null != shopIds) { + shopIds.removeAll(coldShopIds); + List currSIds = new ArrayList(); + for (Long sid: shopIds) { + 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); + } + } } } - - if (null != shopIds) { - shopIds.removeAll(coldShopIds); - List currSIds = new ArrayList(); - for (Long sid: shopIds) { - 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, "商户更新成功"); } catch (Exception e) { From bc19b2d818890c61c61cdbc80d1aa977e5a9c38d Mon Sep 17 00:00:00 2001 From: xiaohanzi Date: Mon, 7 Sep 2020 17:36:24 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E6=9B=B4=E6=96=B0redis=E9=85=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- mallinkAdmin/src/main/resources/application-prod.yml | 8 ++++---- mallinkBApi/src/main/resources/application-prod.yml | 8 ++++---- mallinkCApi/src/main/resources/application-prod.yml | 12 ++++++------ .../src/main/resources/application-prod.yml | 8 ++++---- .../src/main/resources/application-prod.yml | 8 ++++---- .../src/main/resources/application-prod.yml | 8 ++++---- .../src/main/resources/application-prod.yml | 8 ++++---- .../src/main/resources/application-prod.yml | 8 ++++---- .../src/main/resources/application-prod.yml | 8 ++++---- 9 files changed, 38 insertions(+), 38 deletions(-) diff --git a/mallinkAdmin/src/main/resources/application-prod.yml b/mallinkAdmin/src/main/resources/application-prod.yml index 863bf49f0..d923c1d09 100644 --- a/mallinkAdmin/src/main/resources/application-prod.yml +++ b/mallinkAdmin/src/main/resources/application-prod.yml @@ -24,9 +24,9 @@ spring: connectionProperties: "druid.stat.mergeSql=true;druid.stat.slowSqlMillis=60000" # REDIS redis: - host: 101.201.103.81 + host: r-2zeaglwf13qqmnllj5.redis.rds.aliyuncs.com port: 6379 - password: ENC(KD+AiEPSefoV6aKm5qchSASXFGijMzHL) + password: mallone:iF0rm@2l2ol9 timeout: 3600 expire: 1800 #30分钟 database: 1 @@ -104,9 +104,9 @@ wechat: componentToken: ENC(rkxj0733WxFFDLgA9x01m2s5Fi2L+0PC) componentAesKey: ENC(EIbJUBpbYOrLb4YQ/HXLQmxlxgAqIp2ZmpnGICC8pu5xiTz3Cqfkbwd2S8raCcK/IvYcX2GmedI=) redis: - host: 101.201.103.81 + host: r-2zeaglwf13qqmnllj5.redis.rds.aliyuncs.com port: 6379 - password: ENC(KD+AiEPSefoV6aKm5qchSASXFGijMzHL) + password: mallone:iF0rm@2l2ol9 timeout: 3600 expire: 1800 #30分钟 database: 2 diff --git a/mallinkBApi/src/main/resources/application-prod.yml b/mallinkBApi/src/main/resources/application-prod.yml index 684cc245e..209002d3b 100644 --- a/mallinkBApi/src/main/resources/application-prod.yml +++ b/mallinkBApi/src/main/resources/application-prod.yml @@ -23,9 +23,9 @@ spring: maxOpenPreparedStatements: 20 # REDIS redis: - host: 101.201.103.81 + host: r-2zeaglwf13qqmnllj5.redis.rds.aliyuncs.com port: 6379 - password: ENC(KD+AiEPSefoV6aKm5qchSASXFGijMzHL) + password: mallone:iF0rm@2l2ol9 timeout: 3600 expire: 1800 #30分钟 database: 1 @@ -96,9 +96,9 @@ wechat: componentToken: ENC(rkxj0733WxFFDLgA9x01m2s5Fi2L+0PC) componentAesKey: ENC(EIbJUBpbYOrLb4YQ/HXLQmxlxgAqIp2ZmpnGICC8pu5xiTz3Cqfkbwd2S8raCcK/IvYcX2GmedI=) redis: - host: 101.201.103.81 + host: r-2zeaglwf13qqmnllj5.redis.rds.aliyuncs.com port: 6379 - password: ENC(KD+AiEPSefoV6aKm5qchSASXFGijMzHL) + password: mallone:iF0rm@2l2ol9 timeout: 3600 expire: 1800 #30分钟 database: 2 diff --git a/mallinkCApi/src/main/resources/application-prod.yml b/mallinkCApi/src/main/resources/application-prod.yml index 4c9b40f86..61490f179 100644 --- a/mallinkCApi/src/main/resources/application-prod.yml +++ b/mallinkCApi/src/main/resources/application-prod.yml @@ -23,9 +23,9 @@ spring: maxOpenPreparedStatements: 20 # REDIS redis: - host: 101.201.103.81 + host: r-2zeaglwf13qqmnllj5.redis.rds.aliyuncs.com port: 6379 - password: ENC(KD+AiEPSefoV6aKm5qchSASXFGijMzHL) + password: mallone:iF0rm@2l2ol9 timeout: 3600 expire: 1800 #30分钟 database: 1 @@ -33,9 +33,9 @@ spring: jedis: pool: max-active: 100 - max-idle: 20 + max-idle: 100 max-wait: -1 - min-idle: 0 + min-idle: 10 # SMS aliyun: sms: @@ -95,9 +95,9 @@ wechat: componentToken: ENC(rkxj0733WxFFDLgA9x01m2s5Fi2L+0PC) componentAesKey: ENC(EIbJUBpbYOrLb4YQ/HXLQmxlxgAqIp2ZmpnGICC8pu5xiTz3Cqfkbwd2S8raCcK/IvYcX2GmedI=) redis: - host: 101.201.103.81 + host: r-2zeaglwf13qqmnllj5.redis.rds.aliyuncs.com port: 6379 - password: ENC(KD+AiEPSefoV6aKm5qchSASXFGijMzHL) + password: mallone:iF0rm@2l2ol9 timeout: 3600 expire: 1800 #30分钟 database: 2 diff --git a/mallinkCallback/src/main/resources/application-prod.yml b/mallinkCallback/src/main/resources/application-prod.yml index 8c1f57158..939f31bb2 100644 --- a/mallinkCallback/src/main/resources/application-prod.yml +++ b/mallinkCallback/src/main/resources/application-prod.yml @@ -24,9 +24,9 @@ spring: connectionProperties: "druid.stat.mergeSql=true;druid.stat.slowSqlMillis=6000" # REDIS redis: - host: 101.201.103.81 + host: r-2zeaglwf13qqmnllj5.redis.rds.aliyuncs.com port: 6379 - password: ENC(KD+AiEPSefoV6aKm5qchSASXFGijMzHL) + password: mallone:iF0rm@2l2ol9 timeout: 3600 expire: 1800 #30分钟 database: 1 @@ -100,9 +100,9 @@ wechat: componentToken: ENC(rkxj0733WxFFDLgA9x01m2s5Fi2L+0PC) componentAesKey: ENC(EIbJUBpbYOrLb4YQ/HXLQmxlxgAqIp2ZmpnGICC8pu5xiTz3Cqfkbwd2S8raCcK/IvYcX2GmedI=) redis: - host: 101.201.103.81 + host: r-2zeaglwf13qqmnllj5.redis.rds.aliyuncs.com port: 6379 - password: ENC(KD+AiEPSefoV6aKm5qchSASXFGijMzHL) + password: mallone:iF0rm@2l2ol9 timeout: 3600 expire: 1800 #30分钟 database: 2 diff --git a/mallinkMQConsumer/src/main/resources/application-prod.yml b/mallinkMQConsumer/src/main/resources/application-prod.yml index 615eb0ca7..cf810e8ca 100644 --- a/mallinkMQConsumer/src/main/resources/application-prod.yml +++ b/mallinkMQConsumer/src/main/resources/application-prod.yml @@ -24,9 +24,9 @@ spring: connectionProperties: "druid.stat.mergeSql=true;druid.stat.slowSqlMillis=6000" # REDIS redis: - host: 101.201.103.81 + host: r-2zeaglwf13qqmnllj5.redis.rds.aliyuncs.com port: 6379 - password: ENC(KD+AiEPSefoV6aKm5qchSASXFGijMzHL) + password: mallone:iF0rm@2l2ol9 timeout: 3600 expire: 1800 #30分钟 database: 1 @@ -95,9 +95,9 @@ wechat: componentToken: ENC(rkxj0733WxFFDLgA9x01m2s5Fi2L+0PC) componentAesKey: ENC(EIbJUBpbYOrLb4YQ/HXLQmxlxgAqIp2ZmpnGICC8pu5xiTz3Cqfkbwd2S8raCcK/IvYcX2GmedI=) redis: - host: 101.201.103.81 + host: r-2zeaglwf13qqmnllj5.redis.rds.aliyuncs.com port: 6379 - password: ENC(KD+AiEPSefoV6aKm5qchSASXFGijMzHL) + password: mallone:iF0rm@2l2ol9 timeout: 3600 expire: 1800 #30分钟 database: 2 diff --git a/mallinkPosApi/src/main/resources/application-prod.yml b/mallinkPosApi/src/main/resources/application-prod.yml index 451f12fbe..a918e6276 100644 --- a/mallinkPosApi/src/main/resources/application-prod.yml +++ b/mallinkPosApi/src/main/resources/application-prod.yml @@ -23,9 +23,9 @@ spring: maxOpenPreparedStatements: 20 # REDIS redis: - host: 101.201.103.81 + host: r-2zeaglwf13qqmnllj5.redis.rds.aliyuncs.com port: 6379 - password: ENC(KD+AiEPSefoV6aKm5qchSASXFGijMzHL) + password: mallone:iF0rm@2l2ol9 timeout: 3600 expire: 1800 #30分钟 database: 1 @@ -94,9 +94,9 @@ wechat: componentToken: ENC(rkxj0733WxFFDLgA9x01m2s5Fi2L+0PC) componentAesKey: ENC(EIbJUBpbYOrLb4YQ/HXLQmxlxgAqIp2ZmpnGICC8pu5xiTz3Cqfkbwd2S8raCcK/IvYcX2GmedI=) redis: - host: 101.201.103.81 + host: r-2zeaglwf13qqmnllj5.redis.rds.aliyuncs.com port: 6379 - password: ENC(KD+AiEPSefoV6aKm5qchSASXFGijMzHL) + password: mallone:iF0rm@2l2ol9 timeout: 3600 expire: 1800 #30分钟 database: 2 diff --git a/mallinkSchedule/src/main/resources/application-prod.yml b/mallinkSchedule/src/main/resources/application-prod.yml index feff24cfe..996e1db91 100644 --- a/mallinkSchedule/src/main/resources/application-prod.yml +++ b/mallinkSchedule/src/main/resources/application-prod.yml @@ -24,9 +24,9 @@ spring: connectionProperties: "druid.stat.mergeSql=true;druid.stat.slowSqlMillis=6000" # REDIS redis: - host: 101.201.103.81 + host: r-2zeaglwf13qqmnllj5.redis.rds.aliyuncs.com port: 6379 - password: ENC(KD+AiEPSefoV6aKm5qchSASXFGijMzHL) + password: mallone:iF0rm@2l2ol9 timeout: 3600 expire: 1800 #30分钟 database: 1 @@ -95,9 +95,9 @@ wechat: componentToken: ENC(rkxj0733WxFFDLgA9x01m2s5Fi2L+0PC) componentAesKey: ENC(EIbJUBpbYOrLb4YQ/HXLQmxlxgAqIp2ZmpnGICC8pu5xiTz3Cqfkbwd2S8raCcK/IvYcX2GmedI=) redis: - host: 101.201.103.81 + host: r-2zeaglwf13qqmnllj5.redis.rds.aliyuncs.com port: 6379 - password: ENC(KD+AiEPSefoV6aKm5qchSASXFGijMzHL) + password: mallone:iF0rm@2l2ol9 timeout: 3600 expire: 1800 #30分钟 database: 2 diff --git a/mallinkSysAdmin/src/main/resources/application-prod.yml b/mallinkSysAdmin/src/main/resources/application-prod.yml index 0d304ad57..a8b4ae8b0 100644 --- a/mallinkSysAdmin/src/main/resources/application-prod.yml +++ b/mallinkSysAdmin/src/main/resources/application-prod.yml @@ -24,9 +24,9 @@ spring: connectionProperties: "druid.stat.mergeSql=true;druid.stat.slowSqlMillis=6000" # REDIS redis: - host: 101.201.103.81 + host: r-2zeaglwf13qqmnllj5.redis.rds.aliyuncs.com port: 6379 - password: ENC(KD+AiEPSefoV6aKm5qchSASXFGijMzHL) + password: mallone:iF0rm@2l2ol9 timeout: 3600 expire: 1800 #30分钟 database: 1 @@ -102,9 +102,9 @@ wechat: componentToken: ENC(rkxj0733WxFFDLgA9x01m2s5Fi2L+0PC) componentAesKey: ENC(EIbJUBpbYOrLb4YQ/HXLQmxlxgAqIp2ZmpnGICC8pu5xiTz3Cqfkbwd2S8raCcK/IvYcX2GmedI=) redis: - host: 101.201.103.81 + host: r-2zeaglwf13qqmnllj5.redis.rds.aliyuncs.com port: 6379 - password: ENC(KD+AiEPSefoV6aKm5qchSASXFGijMzHL) + password: mallone:iF0rm@2l2ol9 timeout: 3600 expire: 1800 #30分钟 database: 2 diff --git a/mallinkWebSocketServer/src/main/resources/application-prod.yml b/mallinkWebSocketServer/src/main/resources/application-prod.yml index 937543aeb..4917f77bf 100644 --- a/mallinkWebSocketServer/src/main/resources/application-prod.yml +++ b/mallinkWebSocketServer/src/main/resources/application-prod.yml @@ -24,9 +24,9 @@ spring: connectionProperties: "druid.stat.mergeSql=true;druid.stat.slowSqlMillis=6000" # REDIS redis: - host: 101.201.103.81 + host: r-2zeaglwf13qqmnllj5.redis.rds.aliyuncs.com port: 6379 - password: ENC(KD+AiEPSefoV6aKm5qchSASXFGijMzHL) + password: mallone:iF0rm@2l2ol9 timeout: 3600 expire: 1800 #30分钟 database: 3 @@ -96,9 +96,9 @@ wechat: componentToken: ENC(rkxj0733WxFFDLgA9x01m2s5Fi2L+0PC) componentAesKey: ENC(EIbJUBpbYOrLb4YQ/HXLQmxlxgAqIp2ZmpnGICC8pu5xiTz3Cqfkbwd2S8raCcK/IvYcX2GmedI=) redis: - host: 101.201.103.81 + host: r-2zeaglwf13qqmnllj5.redis.rds.aliyuncs.com port: 6379 - password: ENC(KD+AiEPSefoV6aKm5qchSASXFGijMzHL) + password: mallone:iF0rm@2l2ol9 timeout: 3600 expire: 1800 #30分钟 database: 2