~config:consumer-order.redisUtil;

liquidnet-bus-service/liquidnet-service-consumer-all/liquidnet-service-consumer-order/src/main/java/com/liquidnet/service/consumer/order/utils/GoblinNftUtils.java

 package com.liquidnet.service.consumer.order.utils;
 
-import com.liquidnet.common.cache.redis.util.RedisUtil;
+import com.liquidnet.common.cache.redis.util.RedisDataSourceUtil;
 import com.liquidnet.service.goblin.constant.GoblinRedisConst;
 import com.liquidnet.service.goblin.dto.vo.GoblinListCollectVo;
 import com.liquidnet.service.goblin.dto.vo.GoblinNftOrderVo;
@@ -22,8 +22,10 @@ import java.util.stream.Collectors;
 @Component
 public class GoblinNftUtils {
 
+//    @Autowired
+//    private RedisUtil redisUtil;
     @Autowired
-    private RedisUtil redisUtil;
+    private RedisDataSourceUtil redisDataSourceUtil;
     @Autowired
     private MongoTemplate mongoTemplate;
     @Autowired
@@ -34,7 +36,7 @@ public class GoblinNftUtils {
     // 库存
     public int decrSkuStock(String skuId, Integer stock) {
         String redisKey = GoblinRedisConst.REAL_STOCK_SKU.concat(skuId);
-        return (int) redisUtil.decr(redisKey, stock);
+        return (int) redisDataSourceUtil.getRedisKylinUtil().decr(redisKey, stock);
     }
 
     public int incrSkuStock(String marketPre, String skuId, Integer stock) {
@@ -43,25 +45,25 @@ public class GoblinNftUtils {
             rk = rk.concat(marketPre + ":");
         }
         rk = rk.concat(skuId);
-        return (int) redisUtil.incr(rk, stock);
+        return (int) redisDataSourceUtil.getRedisKylinUtil().incr(rk, stock);
     }
 
     // 减少 用户sku购买个数
     public int decrSkuCountByUid(String uid, String skuId, int number) {
         String redisKey = GoblinRedisConst.REDIS_GOBLIN_BUY_COUNT.concat(uid + ":skuId:" + skuId);
-        return (int) redisUtil.decr(redisKey, number);
+        return (int) redisDataSourceUtil.getRedisKylinUtil().decr(redisKey, number);
     }
 
     // 订单详情vo
     public void setNftOrder(GoblinNftOrderVo vo) {
         String redisKey = GoblinRedisConst.REDIS_GOBLIN_NFT_ORDER_INFO.concat(vo.getOrderId());
-        redisUtil.set(redisKey, vo);
+        redisDataSourceUtil.getRedisKylinUtil().set(redisKey, vo);
     }
 
     // 获取 订单详情vo
     public GoblinNftOrderVo getNftOrder(String orderId) {
         String redisKey = GoblinRedisConst.REDIS_GOBLIN_NFT_ORDER_INFO.concat(orderId);
-        Object obj = redisUtil.get(redisKey);
+        Object obj = redisDataSourceUtil.getRedisKylinUtil().get(redisKey);
         if (obj == null) {
             return null;
         } else {
@@ -117,7 +119,7 @@ public class GoblinNftUtils {
      * @return
      */
     public List<GoblinListCollectVo> getGoblinListCollect(String skuId) {
-        Object obj = redisUtil.get(GoblinRedisConst.LIST_COLLECT.concat(skuId));
+        Object obj = redisDataSourceUtil.getRedisKylinUtil().get(GoblinRedisConst.LIST_COLLECT.concat(skuId));
         if (obj == null) {
             return new ArrayList<>();
         } else {

liquidnet-bus-service/liquidnet-service-consumer-all/liquidnet-service-consumer-order/src/main/java/com/liquidnet/service/consumer/order/utils/KylinOrderUtils.java

 package com.liquidnet.service.consumer.order.utils;
 
 import com.alibaba.fastjson.JSON;
-import com.liquidnet.common.cache.redis.util.RedisUtil;
+import com.liquidnet.common.cache.redis.util.RedisDataSourceUtil;
 import com.liquidnet.commons.lang.util.CollectionUtil;
 import com.liquidnet.commons.lang.util.CurrentUtil;
 import com.liquidnet.commons.lang.util.HttpUtil;
 import com.liquidnet.service.candy.param.BackCouponParam;
-import com.liquidnet.service.goblin.constant.GoblinRedisConst;
-import com.liquidnet.service.goblin.dto.vo.GoblinListCollectVo;
-import com.liquidnet.service.goblin.dto.vo.GoblinNftOrderVo;
 import com.liquidnet.service.kylin.constant.KylinRedisConst;
 import com.liquidnet.service.kylin.dto.vo.mongo.KylinOrderTicketEntitiesVo;
 import com.liquidnet.service.kylin.dto.vo.mongo.KylinOrderTicketVo;
 import com.liquidnet.service.kylin.dto.vo.mongo.KylinPerformanceVo;
 import com.liquidnet.service.kylin.dto.vo.returns.KylinOrderListVo;
 import com.liquidnet.service.kylin.entity.KylinOrderCoupons;
-import com.mongodb.BasicDBObject;
-import com.mongodb.client.result.UpdateResult;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.data.mongodb.core.MongoTemplate;
-import org.springframework.data.mongodb.core.convert.MongoConverter;
 import org.springframework.data.mongodb.core.query.Criteria;
 import org.springframework.data.mongodb.core.query.Query;
 import org.springframework.stereotype.Component;
 import org.springframework.util.MultiValueMap;
 
-import java.time.LocalDateTime;
 import java.util.ArrayList;
-import java.util.Comparator;
 import java.util.List;
-import java.util.stream.Collectors;
 
 @Component
 @Slf4j
@@ -39,8 +30,10 @@ public class KylinOrderUtils {
 
     @Value("${liquidnet.service.candy.url}")
     private String candyUrl;
+//    @Autowired
+//    private RedisUtil redisUtil;
     @Autowired
-    private RedisUtil redisUtil;
+    private RedisDataSourceUtil redisDataSourceUtil;
     @Autowired
     private MongoTemplate mongoTemplate;
 
@@ -52,21 +45,21 @@ public class KylinOrderUtils {
      * @return
      */
     public KylinOrderTicketVo getOrderTicketVo(String orderId) {
-        Object obj = redisUtil.get(KylinRedisConst.ORDER + orderId);
+        Object obj = redisDataSourceUtil.getRedisKylinUtil().get(KylinRedisConst.ORDER + orderId);
         if (obj!=null) {
             return (KylinOrderTicketVo)obj;
         } else {
             KylinOrderTicketVo ticketData = mongoTemplate.findOne(Query.query(Criteria.where("orderTicketsId").is(orderId)), KylinOrderTicketVo.class, KylinOrderTicketVo.class.getSimpleName());
             List<KylinOrderTicketEntitiesVo> kylinOrderTicketEntitiesVoList = mongoTemplate.find(Query.query(Criteria.where("orderId").is(orderId)), KylinOrderTicketEntitiesVo.class, KylinOrderTicketEntitiesVo.class.getSimpleName());
             ticketData.setEntitiesVoList(kylinOrderTicketEntitiesVoList);
-            redisUtil.set(KylinRedisConst.ORDER + orderId, ticketData);
+            redisDataSourceUtil.getRedisKylinUtil().set(KylinRedisConst.ORDER + orderId, ticketData);
             return ticketData;
         }
     }
 
     public void setOrderTicketVo(String orderId, KylinOrderTicketVo vo) {
         String redisKey = KylinRedisConst.ORDER + orderId;
-        redisUtil.set(redisKey, vo);
+        redisDataSourceUtil.getRedisKylinUtil().set(redisKey, vo);
     }
 
     /**
@@ -79,7 +72,7 @@ public class KylinOrderUtils {
         List<KylinOrderListVo> redisVo = new ArrayList();
         KylinOrderTicketVo data = dataSingle;
         KylinOrderListVo voItem = KylinOrderListVo.getNew().copy(data);
-        List<KylinOrderListVo> redisData = (List<KylinOrderListVo>) redisUtil.get(KylinRedisConst.ORDER_LIST + userId);
+        List<KylinOrderListVo> redisData = (List<KylinOrderListVo>) redisDataSourceUtil.getRedisKylinUtil().get(KylinRedisConst.ORDER_LIST + userId);
         if(redisData==null){
             return false;
         }
@@ -109,7 +102,7 @@ public class KylinOrderUtils {
                 if (redisVo.size() == 0) {
                     vo.add(voItem);
                 }
-                redisUtil.set(KylinRedisConst.ORDER_LIST + userId, vo);
+                redisDataSourceUtil.getRedisKylinUtil().set(KylinRedisConst.ORDER_LIST + userId, vo);
                 return true;
             case 2:
                 for (int i = 0; i < redisVo.size(); i++) {
@@ -122,7 +115,7 @@ public class KylinOrderUtils {
                         vo.add(redisVo.get(i));
                     }
                 }
-                redisUtil.set(KylinRedisConst.ORDER_LIST + userId, vo);
+                redisDataSourceUtil.getRedisKylinUtil().set(KylinRedisConst.ORDER_LIST + userId, vo);
                 return true;
             default:
                 return false;
@@ -148,11 +141,11 @@ public class KylinOrderUtils {
         String performanceIdKey = redisKey + ":" + KylinRedisConst.PERFORMANCE_ID + ":" + performanceId;
         String ticketIdKey = redisKey + ":" + KylinRedisConst.TICKET_ID + ":" + ticketId;
         if (buyCount > 0) {
-            redisUtil.incr(ticketIdKey, buyCount);
-            redisUtil.incr(performanceIdKey, buyCount);
+            redisDataSourceUtil.getRedisKylinUtil().incr(ticketIdKey, buyCount);
+            redisDataSourceUtil.getRedisKylinUtil().incr(performanceIdKey, buyCount);
         } else {
-            redisUtil.decr(ticketIdKey, Math.abs(buyCount));
-            redisUtil.decr(performanceIdKey, Math.abs(buyCount));
+            redisDataSourceUtil.getRedisKylinUtil().decr(ticketIdKey, Math.abs(buyCount));
+            redisDataSourceUtil.getRedisKylinUtil().decr(performanceIdKey, Math.abs(buyCount));
         }
     }
 
@@ -162,12 +155,12 @@ public class KylinOrderUtils {
      * @param performanceId
      */
     public int getPerformanceIsTrueName(String performanceId) {
-        Object obj = redisUtil.get(KylinRedisConst.PERFORMANCES_TRUE_NAME + performanceId);
+        Object obj = redisDataSourceUtil.getRedisKylinUtil().get(KylinRedisConst.PERFORMANCES_TRUE_NAME + performanceId);
         if (obj != null) {
             return (int) obj;
         } else {
             int isTrueName = getPerformanceVo(performanceId).getIsTrueName();
-            redisUtil.set(KylinRedisConst.PERFORMANCES_TRUE_NAME + performanceId, isTrueName);
+            redisDataSourceUtil.getRedisKylinUtil().set(KylinRedisConst.PERFORMANCES_TRUE_NAME + performanceId, isTrueName);
             return isTrueName;
         }
     }
@@ -179,12 +172,12 @@ public class KylinOrderUtils {
      * @return
      */
     public KylinPerformanceVo getPerformanceVo(String performanceId) {
-        if (redisUtil.hasKey(KylinRedisConst.PERFORMANCES + performanceId)) {
+        if (redisDataSourceUtil.getRedisKylinUtil().hasKey(KylinRedisConst.PERFORMANCES + performanceId)) {
         } else {
             KylinPerformanceVo performanceData = mongoTemplate.findOne(Query.query(Criteria.where("performancesId").is(performanceId)), KylinPerformanceVo.class, KylinPerformanceVo.class.getSimpleName());
-            redisUtil.set(KylinRedisConst.PERFORMANCES + performanceId, performanceData);
+            redisDataSourceUtil.getRedisKylinUtil().set(KylinRedisConst.PERFORMANCES + performanceId, performanceData);
         }
-        return (KylinPerformanceVo) redisUtil.get(KylinRedisConst.PERFORMANCES + performanceId);
+        return (KylinPerformanceVo) redisDataSourceUtil.getRedisKylinUtil().get(KylinRedisConst.PERFORMANCES + performanceId);
     }
 
     /**
@@ -196,16 +189,16 @@ public class KylinOrderUtils {
      */
     public int changeSurplusGeneral(String ticketId, int surplusGeneral) {
         if (surplusGeneral > 0) {
-            return (int) redisUtil.incr(KylinRedisConst.PERFORMANCES_INVENTORY + ticketId + ":" + KylinRedisConst.SURPLUS_GENERAL, surplusGeneral);
+            return (int) redisDataSourceUtil.getRedisKylinUtil().incr(KylinRedisConst.PERFORMANCES_INVENTORY + ticketId + ":" + KylinRedisConst.SURPLUS_GENERAL, surplusGeneral);
         } else {
-            return (int) redisUtil.decr(KylinRedisConst.PERFORMANCES_INVENTORY + ticketId + ":" + KylinRedisConst.SURPLUS_GENERAL, Math.abs(surplusGeneral));
+            return (int) redisDataSourceUtil.getRedisKylinUtil().decr(KylinRedisConst.PERFORMANCES_INVENTORY + ticketId + ":" + KylinRedisConst.SURPLUS_GENERAL, Math.abs(surplusGeneral));
         }
     }
 
     // 获取订单券的使用情况
     public ArrayList<KylinOrderCoupons> getOrderCoupon(String orderId) {
         String redisKey = KylinRedisConst.ORDER_COUPON.concat(orderId);
-        Object obj = redisUtil.get(redisKey);
+        Object obj = redisDataSourceUtil.getRedisKylinUtil().get(redisKey);
         if (obj == null) {
             return getKylinOrderCouponsArrayList();
         } else {