From c2c6f54932c5d07cd08b82f7e730cc60d021bee4 Mon Sep 17 00:00:00 2001 From: xhxu Date: Tue, 3 Nov 2020 18:02:28 +0800 Subject: [PATCH 1/3] xingxingdiandeng --- .../impl/WxLevelConfigServiceImpl.java | 20 ++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxLevelConfigServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxLevelConfigServiceImpl.java index 5a659d3f2..6e339452e 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxLevelConfigServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxLevelConfigServiceImpl.java @@ -141,11 +141,11 @@ public class WxLevelConfigServiceImpl implements WxLevelConfigService { @Override public List getByTenantInfo(TenantEntity tenantEntity) { - String key = Constant.levelConfigPrev + tenantEntity.getTenantId(); + String key = Constant.levelConfigPrev + tenantEntity.getFinalTenantId(); List clist = RedisCacheUtils.getCacheListObject(wxLevelConfigListRedisTemplate, key, WxLevelConfig.class); if (null == clist || clist.size() <= 0) { WxLevelConfig wxLevelConfig = new WxLevelConfig(); - wxLevelConfig.setTenantId(tenantEntity.getTenantId()); + wxLevelConfig.setTenantId(tenantEntity.getFinalTenantId()); wxLevelConfig.setSortColumns(BaseEntity.SortField.Points_ASC); clist = wxLevelConfigMapper.findList(wxLevelConfig); RedisCacheUtils.cache(wxLevelConfigListRedisTemplate, key, clist, 3600*24*7); @@ -175,7 +175,7 @@ public class WxLevelConfigServiceImpl implements WxLevelConfigService { @Override public void batchSave(TenantEntity tenantEntity, List records) { final IdWorker idWorker = IdWorker.get(); - wxLevelConfigMapper.deleteAll(tenantEntity.getTenantId()); + wxLevelConfigMapper.deleteAll(tenantEntity.getFinalTenantId()); List levelConfigs = new ArrayList<>(); for(WxLevelConfig levelConfig: records) { if(levelConfig.getId() == null) { @@ -185,7 +185,8 @@ public class WxLevelConfigServiceImpl implements WxLevelConfigService { } else { levelConfig.setUpdateDate(new Date()); } - levelConfig.updateTenantInfo(tenantEntity); +// levelConfig.updateTenantInfo(tenantEntity); + levelConfig.setTenantId(tenantEntity.getFinalTenantId()); levelConfigs.add(levelConfig); } wxLevelConfigMapper.insertBatch(levelConfigs); @@ -197,7 +198,8 @@ public class WxLevelConfigServiceImpl implements WxLevelConfigService { List levelConfigs = new ArrayList(); for(WxLevelConfig levelConfig: records) { if(levelConfig.getId() != null && levelConfig.getCount() != null) { - levelConfig.updateTenantInfo(tenantEntity); +// levelConfig.updateTenantInfo(tenantEntity); + levelConfig.setTenantId(tenantEntity.getFinalTenantId()); levelConfig.setUpdateDate(new Date()); JSONObject jo = new JSONObject(); jo.put(CAPABILITY_SEND_CAR_COUPON,levelConfig.getCount()); @@ -206,7 +208,7 @@ public class WxLevelConfigServiceImpl implements WxLevelConfigService { } } wxLevelConfigMapper.batchUpdate(levelConfigs); - this.deleteRedis(tenantEntity.getTenantId()); + this.deleteRedis(tenantEntity.getFinalTenantId()); } @Override @@ -223,14 +225,14 @@ public class WxLevelConfigServiceImpl implements WxLevelConfigService { @Override public void deleteAll(TenantEntity tenantEntity) { - this.deleteRedis(tenantEntity.getTenantId()); - wxLevelConfigMapper.deleteAll(tenantEntity.getTenantId()); + this.deleteRedis(tenantEntity.getFinalTenantId()); + wxLevelConfigMapper.deleteAll(tenantEntity.getFinalTenantId()); } @Override public String getLevel(TenantEntity tenantEntity, int score) { - return wxLevelConfigMapper.getLevel(tenantEntity.getTenantId(),score); + return wxLevelConfigMapper.getLevel(tenantEntity.getFinalTenantId(),score); } @Override From e74faed572b5ff830369ae4597092e3a83982cb6 Mon Sep 17 00:00:00 2001 From: xhxu Date: Tue, 3 Nov 2020 18:45:38 +0800 Subject: [PATCH 2/3] xingxingdiandeng --- .../com/iformall/service/impl/WxAppinfoServiceImpl.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxAppinfoServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxAppinfoServiceImpl.java index 0b95a4b26..cbda06cb8 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxAppinfoServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxAppinfoServiceImpl.java @@ -153,9 +153,9 @@ public class WxAppinfoServiceImpl implements WxAppinfoService { + "-" + EnumAppType.C.getCode(); record = RedisCacheUtils.getCacheObject(wxAppinfoRedisTemplate, key, WxAppinfo.class); if (null == record) { - record = this.getCAppInfo(new TenantEntity() {{ - setTenantId(tenantId); - }}, payWayWechat); + TenantEntity tenantEntity = new TenantEntity(); + tenantEntity.setTenantId(tenantId); + record = this.getCAppInfo(tenantEntity, payWayWechat); if(record != null){ RedisCacheUtils.cache(wxAppinfoRedisTemplate, key, record, 3600*24*7); } From cd412eafd6275403354bc7e3cf5f36c5282b07a4 Mon Sep 17 00:00:00 2001 From: xhxu Date: Wed, 4 Nov 2020 09:59:29 +0800 Subject: [PATCH 3/3] xingxingdiandeng --- .../main/java/com/iformall/service/impl/WxShopServiceImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxShopServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxShopServiceImpl.java index f6a76eb36..f4a544b03 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxShopServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxShopServiceImpl.java @@ -138,7 +138,7 @@ public class WxShopServiceImpl implements WxShopService { } else { wxRentContract.setShopNumber(wxShop.getShopNumber()); - List list = wxRentContractMapper.selectList(new QueryWrapper(wxRentContract)); + List list = wxRentContractMapper.findList(wxRentContract); // count = list.stream().filter(r -> !r.getStatus().equals(EnumRentContractStatus.SIGNED_RENT_UNPAID.getCode()) && // !r.getStatus().equals(EnumRentContractStatus.RENT_PAID.getCode()) && // !r.getStatus().equals(EnumRentContractStatus.CONTRACT_END_SOON.getCode())).count();