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

liquidnet-bus-service/liquidnet-service-goblin/liquidnet-service-goblin-common/src/main/java/com/liquidnet/service/galaxy/biz/GalaxyTradeBiz.java

@@ -16,7 +16,6 @@ import org.springframework.stereotype.Component;
 
 import javax.annotation.Resource;
 import java.time.LocalDateTime;
-import java.util.Arrays;
 import java.util.List;
 
 /**
@@ -43,16 +42,12 @@ public class GalaxyTradeBiz {
      * @param nftIndex
      */
     public boolean isNeedSwitch(String skuid,String nftIndex){
-        String nums = dataUtils.getGoblinNumList(skuid);
-        if(StringUtil.isNotEmpty(nums)){
-            String[] numsArray = nums.split(",");
-            if(numsArray.length>0){
-                List<String> numsList = Arrays.asList(numsArray);
+        List numsList = dataUtils.getGoblinNumList(skuid);
+        if(StringUtil.isNotEmpty(numsList)){
             if(numsList.contains(nftIndex)){
                 return true;
             }
         }
-        }
         return false;
     }
 

liquidnet-bus-service/liquidnet-service-goblin/liquidnet-service-goblin-common/src/main/java/com/liquidnet/service/galaxy/utils/AbstractDataUtils.java

 package com.liquidnet.service.galaxy.utils;
 
 import com.liquidnet.common.cache.redis.util.RedisUtil;
+import com.liquidnet.commons.lang.util.CollectionUtil;
 import com.liquidnet.commons.lang.util.DateUtil;
 import com.liquidnet.service.base.SqlMapping;
 import com.liquidnet.service.base.constant.MQConst;
@@ -17,6 +18,7 @@ import org.springframework.data.mongodb.core.MongoTemplate;
 
 import java.time.LocalDateTime;
 import java.util.Date;
+import java.util.List;
 
 /**
  * 该类为redis+mysql
@@ -483,13 +485,14 @@ public abstract class AbstractDataUtils {
 
 
     //获取sku对应预留号码list
-    public String getGoblinNumList(String skuId){
-        String redisKey = GoblinRedisConst.GOBLIN_NUM_LIST.concat(":").concat(skuId);
+    public List<String> getGoblinNumList(String skuId){
+        String redisKey = GoblinRedisConst.GOBLIN_NUM_LIST.concat(skuId);
         Object obj = this.getRedisUtil().get(redisKey);
-        if(obj!=null){
-            return obj.toString();
+        if (obj == null) {
+            return CollectionUtil.arrayListString();
+        } else {
+            return (List<String>) obj;
         }
-        return null;
     }
 
     //$key+$num+$skuId 根据num+skuId获取DTO

liquidnet-bus-service/liquidnet-service-goblin/liquidnet-service-goblin-impl/src/test/java/com/liquidnet/service/goblin/test/TestRedisUtil.java

+package com.liquidnet.service.goblin.test;
+
+import com.liquidnet.commons.lang.util.JsonUtils;
+import com.liquidnet.service.galaxy.dto.param.GalaxyNftPublishAndBuyReqDto;
+import com.liquidnet.service.galaxy.utils.GalaxyDataUtils;
+import lombok.extern.slf4j.Slf4j;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
+
+import java.util.List;
+
+/**
+ * @author AnJiabin <anjiabin@zhengzai.tv>
+ * @version V1.0
+ * @Description: TODO
+ * @class: TestRedisUtil
+ * @Package com.liquidnet.service.goblin.test
+ * @Copyright: LightNet @ Copyright (c) 2022
+ * @date 2022/7/12 12:02
+ */
+@Slf4j
+@RunWith(SpringJUnit4ClassRunner.class)
+@SpringBootTest
+public class TestRedisUtil {
+    @Autowired
+    private GalaxyDataUtils dataUtils;
+
+    @Test
+    public void test() {
+        String skuId = "2212517482527828303";
+        List rsList = dataUtils.getGoblinNumList(skuId);
+        log.info("rs:{}",JsonUtils.toJson(rsList));
+        GalaxyNftPublishAndBuyReqDto reqDto = dataUtils.getGoblinNumDetails(skuId,String.valueOf(4));
+        log.info("reqDto:{}", JsonUtils.toJson(reqDto));
+    }
+}