| @@ -91,7 +91,7 @@ public class WxLevelConfigServiceImpl implements WxLevelConfigService { | |||||
| l.setUserCount(wxCUserBasicInfoService.findCountByScore(dto)); | l.setUserCount(wxCUserBasicInfoService.findCountByScore(dto)); | ||||
| WxLevelConfigCoupon cc = new WxLevelConfigCoupon(); | WxLevelConfigCoupon cc = new WxLevelConfigCoupon(); | ||||
| cc.updateTenantInfo(l); | |||||
| cc.updateTenantInfo(record); | |||||
| cc.setLevelId(l.getId()); | cc.setLevelId(l.getId()); | ||||
| List<WxLevelConfigCoupon> coupons = wxLevelConfigCouponMapper.findList(cc); | List<WxLevelConfigCoupon> coupons = wxLevelConfigCouponMapper.findList(cc); | ||||
| if (null != coupons && coupons.size() > 0 ) { | if (null != coupons && coupons.size() > 0 ) { | ||||
| @@ -198,7 +198,7 @@ public class WxLevelConfigServiceImpl implements WxLevelConfigService { | |||||
| } else { | } else { | ||||
| wxLevelConfigMapper.updateById(record); | wxLevelConfigMapper.updateById(record); | ||||
| } | } | ||||
| this.deleteRedis(record.getFinalTenantId(), record.getTenantId()); | |||||
| this.deleteRedis(record.getFinalTenantId()); | |||||
| } | } | ||||
| @Transactional(rollbackFor = {Exception.class}) | @Transactional(rollbackFor = {Exception.class}) | ||||
| @@ -253,7 +253,7 @@ public class WxLevelConfigServiceImpl implements WxLevelConfigService { | |||||
| if (isParent) { | if (isParent) { | ||||
| wxLevelConfigMapper.insertBatch(levelConfigs); | wxLevelConfigMapper.insertBatch(levelConfigs); | ||||
| } | } | ||||
| this.deleteRedis(tenantEntity.getFinalTenantId(),tenantEntity.getTenantId()); | |||||
| this.deleteRedis(tenantEntity.getFinalTenantId()); | |||||
| } | } | ||||
| @Override | @Override | ||||
| @@ -274,7 +274,7 @@ public class WxLevelConfigServiceImpl implements WxLevelConfigService { | |||||
| wxLevelConfigMapper.batchUpdate(config); | wxLevelConfigMapper.batchUpdate(config); | ||||
| } | } | ||||
| this.deleteRedis(tenantEntity.getFinalTenantId(),tenantEntity.getTenantId()); | |||||
| this.deleteRedis(tenantEntity.getFinalTenantId()); | |||||
| } | } | ||||
| @Override | @Override | ||||
| @@ -288,15 +288,16 @@ public class WxLevelConfigServiceImpl implements WxLevelConfigService { | |||||
| WxLevelConfigCoupon lc = new WxLevelConfigCoupon(); | WxLevelConfigCoupon lc = new WxLevelConfigCoupon(); | ||||
| lc.updateTenantInfo(records); | lc.updateTenantInfo(records); | ||||
| lc.setLevelId(records.getId()); | lc.setLevelId(records.getId()); | ||||
| //TODO 此处子广场的无法删除,待处理 | |||||
| wxLevelConfigCouponMapper.deleteByConfig(lc); | wxLevelConfigCouponMapper.deleteByConfig(lc); | ||||
| this.deleteRedis(records.getFinalTenantId(),records.getTenantId()); | |||||
| this.deleteRedis(records.getFinalTenantId()); | |||||
| wxLevelConfigMapper.deleteById(id); | wxLevelConfigMapper.deleteById(id); | ||||
| } | } | ||||
| @Override | @Override | ||||
| public void deleteAll(TenantEntity tenantEntity) { | public void deleteAll(TenantEntity tenantEntity) { | ||||
| this.deleteRedis(tenantEntity.getFinalTenantId(),tenantEntity.getTenantId()); | |||||
| this.deleteRedis(tenantEntity.getFinalTenantId()); | |||||
| wxLevelConfigMapper.deleteAll(tenantEntity.getFinalTenantId()); | wxLevelConfigMapper.deleteAll(tenantEntity.getFinalTenantId()); | ||||
| } | } | ||||
| @@ -311,8 +312,9 @@ public class WxLevelConfigServiceImpl implements WxLevelConfigService { | |||||
| return wxLevelMerchantapper.findListCVo(record); | return wxLevelMerchantapper.findListCVo(record); | ||||
| } | } | ||||
| private void deleteRedis(String finalTenantId,String tenantId){ | |||||
| String key1 = Constant.levelConfigPrev + finalTenantId+":"+tenantId; | |||||
| RedisCacheUtils.removeCache(wxLevelConfigListRedisTemplate, key1); | |||||
| private void deleteRedis(String finalTenantId){ | |||||
| String key1 = Constant.levelConfigPrev + finalTenantId; | |||||
| //RedisCacheUtils.removeCache(wxLevelConfigListRedisTemplate, key1); | |||||
| RedisCacheUtils.removeCachePrefix(wxLevelConfigListRedisTemplate, key1); | |||||
| } | } | ||||
| } | } | ||||