| @@ -141,11 +141,11 @@ public class WxLevelConfigServiceImpl implements WxLevelConfigService { | |||
| @Override | |||
| 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); | |||
| 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<WxLevelConfig> records) { | |||
| final IdWorker idWorker = IdWorker.get(); | |||
| wxLevelConfigMapper.deleteAll(tenantEntity.getTenantId()); | |||
| wxLevelConfigMapper.deleteAll(tenantEntity.getFinalTenantId()); | |||
| List<WxLevelConfig> 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<WxLevelConfig> levelConfigs = new ArrayList<WxLevelConfig>(); | |||
| 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 | |||