Merge branch 'dev_nft_411' of...

Merge branch 'dev_nft_411' of http://gitlab.zhengzai.tv/dongjingwei/liquidnet-bus-v1 into dev_nft_411

liquidnet-bus-service/liquidnet-service-consumer-all/liquidnet-service-consumer-kylin/src/main/java/com/liquidnet/service/consumer/kylin/receiver/ConsumerGoblinBizArtworkClqRdsReceiver.java

@@ -63,7 +63,7 @@ public class ConsumerGoblinBizArtworkClqRdsReceiver extends AbstractBizRedisRece
                 aBoolean = true;
             } else {
                 String[] msgArr = msg.split(",");
-                String skuId = msgArr[0], time = msgArr[1];
+                String skuId = msgArr[0], time = msgArr.length == 2 ? msgArr[1] : null;
 
                 LocalDateTime now = LocalDateTime.now(), checkTime = now.minusSeconds(10);
                 LocalDateTime createAt = StringUtils.isEmpty(time) ? checkTime : LocalDateTime.parse(time);

liquidnet-bus-service/liquidnet-service-consumer-all/liquidnet-service-consumer-kylin/src/main/java/com/liquidnet/service/consumer/kylin/receiver/ConsumerGoblinBizArtworkUplRdsReceiver.java

@@ -27,6 +27,7 @@ import org.springframework.data.redis.connection.stream.StreamRecords;
 import org.springframework.data.redis.core.StreamOperations;
 import org.springframework.stereotype.Component;
 
+import java.time.LocalDateTime;
 import java.util.HashMap;
 import java.util.LinkedList;
 
@@ -144,7 +145,7 @@ public class ConsumerGoblinBizArtworkUplRdsReceiver extends AbstractBizRedisRece
         streamOperations.add(StreamRecords.mapBacked(sqlUpdateMap).withStreamKey(MQConst.GoblinQueue.SQL_GOODS.getKey()));
 
         HashMap<String, String> toQueueBeClaimQueryMsg = CollectionUtil.mapStringString();
-        toQueueBeClaimQueryMsg.put(MQConst.QUEUE_MESSAGE_KEY, skuId);
+        toQueueBeClaimQueryMsg.put(MQConst.QUEUE_MESSAGE_KEY, skuId.concat(",").concat(String.valueOf(LocalDateTime.now())));
         streamOperations.add(StreamRecords.mapBacked(toQueueBeClaimQueryMsg).withStreamKey(MQConst.GoblinQueue.BIZ_ARTWORK_CLQ.getKey()));
         return true;
     }

liquidnet-bus-service/liquidnet-service-goblin/liquidnet-service-goblin-impl/docu/db_0315_jxl_nft.sql

@@ -26,7 +26,7 @@ alter table goblin_goods_sku add sale_stop_time datetime null comment '停售时
 alter table goblin_goods_sku add soldout_status char default '0' not null comment '是否售罄[0-否|1-是]' after shelves_status;
 alter table goblin_goods_sku add sku_canbuy char null comment '是否购买[0-否|1-是]' after sku_appear;
 alter table goblin_goods_sku add unbox char default '0' not null null comment '是否盲盒[0-否|1-是]' after sku_canbuy;
-alter table goblin_goods_sku add hit_ratio decimal(3, 2) null comment '盲盒命中率[0.01~100%]' after unbox;
+alter table goblin_goods_sku add hit_ratio decimal(8, 2) null comment '盲盒命中率[0.01~100%]' after unbox;
 alter table goblin_goods_sku add opening_time datetime null comment '盲盒开启时间' after hit_ratio;
 alter table goblin_goods_sku add opening_limit int default 0 comment '盲盒开启时限[单位秒]' after opening_time;
 
@@ -54,7 +54,7 @@ create table goblin_goods_sku_nft
     nft_url       varchar(500) null comment 'NFT素材访问URL',
     series_id     varchar(256) null comment 'NFT系列ID',
     series_hash   varchar(256) null comment 'NFT系列HASH',
-    nft_hash      varchar(25)  null comment 'NFT藏品HASH',
+    nft_hash      varchar(256)  null comment 'NFT藏品HASH',
     declare_at    varchar(25)  null comment 'NFT系列声明时间',
     created_at    datetime     not null,
     updated_at    datetime     null,