Merge remote-tracking branch 'origin/dev_goblin' into dev_goblin

liquidnet-bus-service/liquidnet-service-sweet/src/main/java/com/liquidnet/service/sweet/utils/RedisArDataUtils.java

@@ -32,7 +32,7 @@ public class RedisArDataUtils {
 
     public List<SweetPerformArtistTimeListDto> getArtistTimeList(String performanceId) {
         String redisKey = SweetConstant.REDIS_KEY_SWEET_MANUAL_ARTIST_TIME_LIST.concat(performanceId);
-        redisUtil.del(redisKey);
+//        redisUtil.del(redisKey);
         Object obj = redisUtil.get(redisKey);
         if (obj == null) {
             List<SweetPerformArtistTimeListDto> performArtistTimeList = new ArrayList<>();

liquidnet-bus-service/liquidnet-service-sweet/src/main/java/com/liquidnet/service/sweet/utils/RedisDataUtils.java

@@ -2,18 +2,16 @@ package com.liquidnet.service.sweet.utils;
 
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.liquidnet.common.cache.redis.util.RedisUtil;
-import com.liquidnet.commons.lang.util.*;
-import com.liquidnet.service.base.ResponseDto;
+import com.liquidnet.commons.lang.util.CollectionUtil;
+import com.liquidnet.commons.lang.util.DateUtil;
+import com.liquidnet.commons.lang.util.IDGenerator;
+import com.liquidnet.commons.lang.util.RandomUtil;
 import com.liquidnet.service.base.SqlMapping;
 import com.liquidnet.service.base.constant.MQConst;
 import com.liquidnet.service.feign.slime.api.FeignSlimeApiClient;
-import com.liquidnet.service.slime.constant.SlimeRedisConst;
 import com.liquidnet.service.slime.dto.vo.SlimeFieldsDetailsVo;
 import com.liquidnet.service.sweet.constant.SweetConstant;
-import com.liquidnet.service.sweet.dto.SweetManualAppletDto;
-import com.liquidnet.service.sweet.dto.SweetManualArtistList2Dto;
-import com.liquidnet.service.sweet.dto.SweetManualArtistListDto;
-import com.liquidnet.service.sweet.dto.SweetManualArtistStageListDto;
+import com.liquidnet.service.sweet.dto.*;
 import com.liquidnet.service.sweet.dto.param.poster.SweetStrawberryParam;
 import com.liquidnet.service.sweet.dto.vo.IntegralActivityDrawVo;
 import com.liquidnet.service.sweet.dto.vo.IntegralActivityVo;
@@ -55,6 +53,7 @@ public class RedisDataUtils {
     private SweetArtistsMapper sweetArtistsMapper;
     @Autowired
     private FeignSlimeApiClient feignSlimeApiClient;
+
     public List<SweetManualAppletDto> setPushList() {
         String redisKey = SweetConstant.REDIS_KEY_SWEET_MANUAL_PUSH_LIST;
         List<SweetManualAppletDto> data = sweetManualMapper.getManualAppletDto();
@@ -219,6 +218,13 @@ public class RedisDataUtils {
 
     public void deleteTimeListRedisData(String manualId) {
         redisUtil.del(SweetConstant.REDIS_KEY_SWEET_MANUAL_TIME_LIST.concat(manualId));//列表
+
+        HashMap<String, Object> map = CollectionUtil.mapStringObject();
+        map.put("manualId", manualId);
+        SweetManualDto vo = sweetManualMapper.getManualDetails(map);
+        if (null != vo) {
+            redisUtil.del(SweetConstant.REDIS_KEY_SWEET_MANUAL_ARTIST_TIME_LIST.concat(vo.getPerformancesId()));
+        }
     }
 
     public void deleteSortRedisData(String manualId) {
@@ -800,7 +806,7 @@ public class RedisDataUtils {
         redisUtil.decr(redisKey, num);
     }
 
-    public void setSendCoupon(String drawId,int value) {
+    public void setSendCoupon(String drawId, int value) {
         String redisKey = SweetConstant.REDIS_KEY_SWEET_SEND_COUPON.concat(drawId);
         redisUtil.set(redisKey, 0);
     }
@@ -866,12 +872,12 @@ public class RedisDataUtils {
         }
     }
 
-    public void delPerformanceARById(String performanceId){
+    public void delPerformanceARById(String performanceId) {
         String redisKey = SweetConstant.REDIS_KEY_SWEET_PERFORMANCE_AR.concat(performanceId + "");
         redisUtil.del(redisKey);
     }
 
-    public List<SweetPerformanceShow> getPerformanceListInApp(){
+    public List<SweetPerformanceShow> getPerformanceListInApp() {
         String redisKey = SweetConstant.REDIS_KEY_SWEET_PERFORMANCE_AR.concat("*");
         Object obj = redisUtil.get(redisKey);
         if (obj == null) {