platform redis bug修复

liquidnet-bus-service/liquidnet-service-platform/liquidnet-service-platform-impl/src/main/java/com/liquidnet/service/platform/service/impl/kylin/PlatformGroupBuyTaskServiceImpl.java

 package com.liquidnet.service.platform.service.impl.kylin;
 
-import com.liquidnet.common.cache.redis.util.RedisUtil;
+import com.liquidnet.common.cache.redis.util.RedisDataSourceUtil;
 import com.liquidnet.commons.lang.util.DateUtil;
 import com.liquidnet.commons.lang.util.HttpUtil;
 import com.liquidnet.service.base.SqlMapping;
@@ -39,7 +39,7 @@ public class PlatformGroupBuyTaskServiceImpl {
     @Autowired
     private MongoTemplate mongoTemplate;
     @Autowired
-    private RedisUtil redisUtil;
+    private RedisDataSourceUtil redisDataSourceUtil;
     @Autowired
     private QueueUtils queueUtils;
     @Autowired
@@ -193,8 +193,12 @@ public class PlatformGroupBuyTaskServiceImpl {
     }
 
     private void cacheActivity(KylinGroupBuyActivityVo activity) {
-        redisUtil.del(KylinRedisConst.GROUP_BUY_ACTIVITY.concat(activity.getActivityId()));
-        redisUtil.set(KylinRedisConst.GROUP_BUY_ACTIVITY.concat(activity.getActivityId()), activity, RedisKeyExpireConst.KYLIN_GROUP_BUY_EXPIRE);
+        if (activity == null || activity.getActivityId() == null) {
+            return;
+        }
+        String key = KylinRedisConst.GROUP_BUY_ACTIVITY.concat(activity.getActivityId());
+        redisDataSourceUtil.getRedisKylinUtil().del(key);
+        redisDataSourceUtil.getRedisKylinUtil().set(key, activity, RedisKeyExpireConst.KYLIN_GROUP_BUY_EXPIRE);
     }
 
     private void sendActivityStatusSql(String activityId, Integer fromStatus, Integer toStatus, LocalDateTime updatedAt) {

liquidnet-bus-service/liquidnet-service-platform/liquidnet-service-platform-impl/src/main/java/com/liquidnet/service/platform/utils/GroupBuyPlatformHelper.java

 package com.liquidnet.service.platform.utils;
 
-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.DateUtil;
 import com.liquidnet.service.base.SqlMapping;
@@ -35,7 +35,7 @@ public class GroupBuyPlatformHelper {
     @Autowired
     private MongoTemplate mongoTemplate;
     @Autowired
-    private RedisUtil redisUtil;
+    private RedisDataSourceUtil redisDataSourceUtil;
     @Autowired
     private QueueUtils queueUtils;
 
@@ -43,14 +43,14 @@ public class GroupBuyPlatformHelper {
         if (StringUtils.isBlank(groupOrderId)) {
             return false;
         }
-        return redisUtil.lock(KylinRedisConst.GROUP_BUY_ORDER_LOCK.concat(groupOrderId), 1, LOCK_SECONDS);
+        return redisDataSourceUtil.getRedisKylinUtil().lock(KylinRedisConst.GROUP_BUY_ORDER_LOCK.concat(groupOrderId), 1, LOCK_SECONDS);
     }
 
     public void unlock(String groupOrderId) {
         if (StringUtils.isBlank(groupOrderId)) {
             return;
         }
-        redisUtil.uLock(KylinRedisConst.GROUP_BUY_ORDER_LOCK.concat(groupOrderId));
+        redisDataSourceUtil.getRedisKylinUtil().uLock(KylinRedisConst.GROUP_BUY_ORDER_LOCK.concat(groupOrderId));
     }
 
     public void withGroupLock(String groupOrderId, Runnable action) {
@@ -163,10 +163,10 @@ public class GroupBuyPlatformHelper {
         if (group == null) {
             return;
         }
-        redisUtil.set(KylinRedisConst.GROUP_BUY_ORDER.concat(group.getGroupOrderId()), group,
+        redisDataSourceUtil.getRedisKylinUtil().set(KylinRedisConst.GROUP_BUY_ORDER.concat(group.getGroupOrderId()), group,
                 RedisKeyExpireConst.KYLIN_GROUP_BUY_EXPIRE);
         if (StringUtils.isNotBlank(group.getShareToken())) {
-            redisUtil.set(KylinRedisConst.GROUP_BUY_ORDER_SHARE.concat(group.getShareToken()), group,
+            redisDataSourceUtil.getRedisKylinUtil().set(KylinRedisConst.GROUP_BUY_ORDER_SHARE.concat(group.getShareToken()), group,
                     RedisKeyExpireConst.KYLIN_GROUP_BUY_EXPIRE);
         }
     }
@@ -175,9 +175,9 @@ public class GroupBuyPlatformHelper {
         if (group == null) {
             return;
         }
-        redisUtil.del(KylinRedisConst.GROUP_BUY_ORDER.concat(group.getGroupOrderId()));
+        redisDataSourceUtil.getRedisKylinUtil().del(KylinRedisConst.GROUP_BUY_ORDER.concat(group.getGroupOrderId()));
         if (StringUtils.isNotBlank(group.getShareToken())) {
-            redisUtil.del(KylinRedisConst.GROUP_BUY_ORDER_SHARE.concat(group.getShareToken()));
+            redisDataSourceUtil.getRedisKylinUtil().del(KylinRedisConst.GROUP_BUY_ORDER_SHARE.concat(group.getShareToken()));
         }
     }
 

liquidnet-bus-service/liquidnet-service-platform/liquidnet-service-platform-impl/src/main/java/com/liquidnet/service/platform/utils/GroupBuySmsSender.java

@@ -2,7 +2,7 @@ package com.liquidnet.service.platform.utils;
 
 import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.node.ObjectNode;
-import com.liquidnet.common.cache.redis.util.RedisUtil;
+import com.liquidnet.common.cache.redis.util.RedisDataSourceUtil;
 import com.liquidnet.common.sms.constant.SmsEnum;
 import com.liquidnet.commons.lang.util.DateUtil;
 import com.liquidnet.commons.lang.util.JsonUtils;
@@ -42,7 +42,7 @@ public class GroupBuySmsSender {
     @Autowired
     private QueueUtils queueUtils;
     @Autowired
-    private RedisUtil redisUtil;
+    private RedisDataSourceUtil redisDataSourceUtil;
     @Autowired
     private MongoTemplate mongoTemplate;
 
@@ -77,7 +77,7 @@ public class GroupBuySmsSender {
             enqueueSms(phone, SmsEnum.ADTemplate.SMS_510285138.name(), empty,
                     group.getGroupOrderId(), "remind1h");
         }
-        redisUtil.set(KylinRedisConst.GROUP_BUY_REMIND_1H.concat(group.getGroupOrderId()), "1",
+        redisDataSourceUtil.getRedisKylinUtil().set(KylinRedisConst.GROUP_BUY_REMIND_1H.concat(group.getGroupOrderId()), "1",
                 RedisKeyExpireConst.KYLIN_GROUP_BUY_EXPIRE);
     }
 
@@ -88,12 +88,12 @@ public class GroupBuySmsSender {
         if (Integer.valueOf(1).equals(group.getRemind1hSent())) {
             return true;
         }
-        Object v = redisUtil.get(KylinRedisConst.GROUP_BUY_REMIND_1H.concat(group.getGroupOrderId()));
+        Object v = redisDataSourceUtil.getRedisKylinUtil().get(KylinRedisConst.GROUP_BUY_REMIND_1H.concat(group.getGroupOrderId()));
         return v != null && ("1".equals(String.valueOf(v)) || "true".equalsIgnoreCase(String.valueOf(v)));
     }
 
     private boolean isSmsEnabled() {
-        Object v = redisUtil.get(KylinRedisConst.GROUP_BUY_SMS_ENABLED);
+        Object v = redisDataSourceUtil.getRedisKylinUtil().get(KylinRedisConst.GROUP_BUY_SMS_ENABLED);
         if (v == null) {
             return true;
         }
@@ -133,7 +133,7 @@ public class GroupBuySmsSender {
     }
 
     private String resolveMobile(String orderTicketsId) {
-        Object cached = redisUtil.get(KylinRedisConst.ORDER.concat(orderTicketsId));
+        Object cached = redisDataSourceUtil.getRedisKylinUtil().get(KylinRedisConst.ORDER.concat(orderTicketsId));
         if (cached instanceof KylinOrderTicketVo) {
             return ((KylinOrderTicketVo) cached).getUserMobile();
         }