| @@ -141,11 +141,11 @@ public class WxLevelConfigServiceImpl implements WxLevelConfigService { | |||||
| @Override | @Override | ||||
| public List<WxLevelConfig> getByTenantInfo(TenantEntity tenantEntity) { | public List<WxLevelConfig> getByTenantInfo(TenantEntity tenantEntity) { | ||||
| String key = Constant.levelConfigPrev + tenantEntity.getTenantId(); | |||||
| String key = Constant.levelConfigPrev + tenantEntity.getFinalTenantId(); | |||||
| List<WxLevelConfig> clist = RedisCacheUtils.getCacheListObject(wxLevelConfigListRedisTemplate, key, WxLevelConfig.class); | List<WxLevelConfig> clist = RedisCacheUtils.getCacheListObject(wxLevelConfigListRedisTemplate, key, WxLevelConfig.class); | ||||
| if (null == clist || clist.size() <= 0) { | if (null == clist || clist.size() <= 0) { | ||||
| WxLevelConfig wxLevelConfig = new WxLevelConfig(); | WxLevelConfig wxLevelConfig = new WxLevelConfig(); | ||||
| wxLevelConfig.setTenantId(tenantEntity.getTenantId()); | |||||
| wxLevelConfig.setTenantId(tenantEntity.getFinalTenantId()); | |||||
| wxLevelConfig.setSortColumns(BaseEntity.SortField.Points_ASC); | wxLevelConfig.setSortColumns(BaseEntity.SortField.Points_ASC); | ||||
| clist = wxLevelConfigMapper.findList(wxLevelConfig); | clist = wxLevelConfigMapper.findList(wxLevelConfig); | ||||
| RedisCacheUtils.cache(wxLevelConfigListRedisTemplate, key, clist, 3600*24*7); | RedisCacheUtils.cache(wxLevelConfigListRedisTemplate, key, clist, 3600*24*7); | ||||
| @@ -175,7 +175,7 @@ public class WxLevelConfigServiceImpl implements WxLevelConfigService { | |||||
| @Override | @Override | ||||
| public void batchSave(TenantEntity tenantEntity, List<WxLevelConfig> records) { | public void batchSave(TenantEntity tenantEntity, List<WxLevelConfig> records) { | ||||
| final IdWorker idWorker = IdWorker.get(); | final IdWorker idWorker = IdWorker.get(); | ||||
| wxLevelConfigMapper.deleteAll(tenantEntity.getTenantId()); | |||||
| wxLevelConfigMapper.deleteAll(tenantEntity.getFinalTenantId()); | |||||
| List<WxLevelConfig> levelConfigs = new ArrayList<>(); | List<WxLevelConfig> levelConfigs = new ArrayList<>(); | ||||
| for(WxLevelConfig levelConfig: records) { | for(WxLevelConfig levelConfig: records) { | ||||
| if(levelConfig.getId() == null) { | if(levelConfig.getId() == null) { | ||||
| @@ -185,7 +185,8 @@ public class WxLevelConfigServiceImpl implements WxLevelConfigService { | |||||
| } else { | } else { | ||||
| levelConfig.setUpdateDate(new Date()); | levelConfig.setUpdateDate(new Date()); | ||||
| } | } | ||||
| levelConfig.updateTenantInfo(tenantEntity); | |||||
| // levelConfig.updateTenantInfo(tenantEntity); | |||||
| levelConfig.setTenantId(tenantEntity.getFinalTenantId()); | |||||
| levelConfigs.add(levelConfig); | levelConfigs.add(levelConfig); | ||||
| } | } | ||||
| wxLevelConfigMapper.insertBatch(levelConfigs); | wxLevelConfigMapper.insertBatch(levelConfigs); | ||||
| @@ -197,7 +198,8 @@ public class WxLevelConfigServiceImpl implements WxLevelConfigService { | |||||
| List<WxLevelConfig> levelConfigs = new ArrayList<WxLevelConfig>(); | List<WxLevelConfig> levelConfigs = new ArrayList<WxLevelConfig>(); | ||||
| for(WxLevelConfig levelConfig: records) { | for(WxLevelConfig levelConfig: records) { | ||||
| if(levelConfig.getId() != null && levelConfig.getCount() != null) { | if(levelConfig.getId() != null && levelConfig.getCount() != null) { | ||||
| levelConfig.updateTenantInfo(tenantEntity); | |||||
| // levelConfig.updateTenantInfo(tenantEntity); | |||||
| levelConfig.setTenantId(tenantEntity.getFinalTenantId()); | |||||
| levelConfig.setUpdateDate(new Date()); | levelConfig.setUpdateDate(new Date()); | ||||
| JSONObject jo = new JSONObject(); | JSONObject jo = new JSONObject(); | ||||
| jo.put(CAPABILITY_SEND_CAR_COUPON,levelConfig.getCount()); | jo.put(CAPABILITY_SEND_CAR_COUPON,levelConfig.getCount()); | ||||
| @@ -206,7 +208,7 @@ public class WxLevelConfigServiceImpl implements WxLevelConfigService { | |||||
| } | } | ||||
| } | } | ||||
| wxLevelConfigMapper.batchUpdate(levelConfigs); | wxLevelConfigMapper.batchUpdate(levelConfigs); | ||||
| this.deleteRedis(tenantEntity.getTenantId()); | |||||
| this.deleteRedis(tenantEntity.getFinalTenantId()); | |||||
| } | } | ||||
| @Override | @Override | ||||
| @@ -223,14 +225,14 @@ public class WxLevelConfigServiceImpl implements WxLevelConfigService { | |||||
| @Override | @Override | ||||
| public void deleteAll(TenantEntity tenantEntity) { | public void deleteAll(TenantEntity tenantEntity) { | ||||
| this.deleteRedis(tenantEntity.getTenantId()); | |||||
| wxLevelConfigMapper.deleteAll(tenantEntity.getTenantId()); | |||||
| this.deleteRedis(tenantEntity.getFinalTenantId()); | |||||
| wxLevelConfigMapper.deleteAll(tenantEntity.getFinalTenantId()); | |||||
| } | } | ||||
| @Override | @Override | ||||
| public String getLevel(TenantEntity tenantEntity, int score) { | public String getLevel(TenantEntity tenantEntity, int score) { | ||||
| return wxLevelConfigMapper.getLevel(tenantEntity.getTenantId(),score); | |||||
| return wxLevelConfigMapper.getLevel(tenantEntity.getFinalTenantId(),score); | |||||
| } | } | ||||
| @Override | @Override | ||||