~迁移藏品生成逻辑至支付成功回调、开盲盒时触发;

liquidnet-bus-service/liquidnet-service-consumer-all/liquidnet-service-consumer-kylin/src/main/java/com/liquidnet/service/consumer/kylin/config/ConsumerCommonBizRedisStreamConfig.java

@@ -2,7 +2,6 @@ package com.liquidnet.service.consumer.kylin.config;
 
 import com.liquidnet.common.cache.redis.config.RedisStreamConfig;
 import com.liquidnet.service.base.constant.MQConst;
-import com.liquidnet.service.consumer.kylin.receiver.ConsumerGoblinBizArtworkGenRdsReceiver;
 import com.liquidnet.service.consumer.kylin.receiver.ConsumerGoblinBizArtworkClqRdsReceiver;
 import com.liquidnet.service.consumer.kylin.receiver.ConsumerGoblinBizArtworkUplRdsReceiver;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -28,8 +27,8 @@ public class ConsumerCommonBizRedisStreamConfig extends RedisStreamConfig {
     ConsumerGoblinBizArtworkUplRdsReceiver consumerGoblinBizArtworkUplRdsReceiver;
     @Autowired
     ConsumerGoblinBizArtworkClqRdsReceiver consumerGoblinBizArtworkClqRdsReceiver;
-    @Autowired
-    ConsumerGoblinBizArtworkGenRdsReceiver consumerGoblinBizArtworkGenRdsReceiver;
+//    @Autowired
+//    ConsumerGoblinBizArtworkGenRdsReceiver consumerGoblinBizArtworkGenRdsReceiver;
 
     @Bean// 藏品上传声明
     public List<Subscription> subscriptionBizArtworkUpl(RedisConnectionFactory factory) {
@@ -63,19 +62,19 @@ public class ConsumerCommonBizRedisStreamConfig extends RedisStreamConfig {
         return subscriptionList;
     }
 
-    @Bean// 藏品生成
-    public List<Subscription> subscriptionBizArtworkGen(RedisConnectionFactory factory) {
-        List<Subscription> subscriptionList = new ArrayList<>();
-        MQConst.GoblinQueue stream = MQConst.GoblinQueue.BIZ_ARTWORK_GEN;
-        this.initStream(stringRedisTemplate, stream.getKey(), stream.getGroup());
-        for (int i = 0; i < 20; i++) {
-            StreamMessageListenerContainer<String, MapRecord<String, String, String>> listenerContainer = this.buildStreamMessageListenerContainer(factory);
-            subscriptionList.add(listenerContainer.receiveAutoAck(
-                    Consumer.from(stream.getGroup(), getConsumerName(stream.name() + i)),
-                    StreamOffset.create(stream.getKey(), ReadOffset.lastConsumed()), consumerGoblinBizArtworkGenRdsReceiver
-            ));
-            listenerContainer.start();
-        }
-        return subscriptionList;
-    }
+//    @Bean// 藏品生成
+//    public List<Subscription> subscriptionBizArtworkGen(RedisConnectionFactory factory) {
+//        List<Subscription> subscriptionList = new ArrayList<>();
+//        MQConst.GoblinQueue stream = MQConst.GoblinQueue.BIZ_ARTWORK_GEN;
+//        this.initStream(stringRedisTemplate, stream.getKey(), stream.getGroup());
+//        for (int i = 0; i < 20; i++) {
+//            StreamMessageListenerContainer<String, MapRecord<String, String, String>> listenerContainer = this.buildStreamMessageListenerContainer(factory);
+//            subscriptionList.add(listenerContainer.receiveAutoAck(
+//                    Consumer.from(stream.getGroup(), getConsumerName(stream.name() + i)),
+//                    StreamOffset.create(stream.getKey(), ReadOffset.lastConsumed()), consumerGoblinBizArtworkGenRdsReceiver
+//            ));
+//            listenerContainer.start();
+//        }
+//        return subscriptionList;
+//    }
 }

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

@@ -79,13 +79,13 @@ public abstract class AbstractOrderCloseReceiver implements StreamListener<Strin
             long durationToMillis = Duration.between(createdAt, closeTime).toMillis();
 
             if (durationToMillis >= 0) {
-                if (type.equals("GOBLIN")) {
-                    return checkOrderTime(orderCode, type);
-                }
-                if (type.equals("NFT")) {
-                    return checkNftOrderTime(orderCode);
-                } else {
-                    return false;
+                switch (type) {
+                    case "GOBLIN":
+                        return checkOrderTime(orderCode, type);
+                    case "NFT":
+                        return checkNftOrderTime(orderCode);
+                    default:
+                        return false;
                 }
             } else {
                 try {

liquidnet-bus-service/liquidnet-service-goblin/liquidnet-service-goblin-impl/src/main/java/com/liquidnet/service/goblin/util/GoblinMongoUtils.java

@@ -1472,6 +1472,13 @@ public class GoblinMongoUtils {
         return pagedResult.setList(voList).setTotal(count, 20);
     }
 
+    /**
+     * 记录用户藏品数据
+     */
+    public void insertUserDigitalArtworkVo(GoblinUserDigitalArtworkVo vo) {
+        mongoTemplate.insert(vo, GoblinUserDigitalArtworkVo.class.getSimpleName());
+    }
+
     /* ----------------------------------------  ---------------------------------------- */
     /* ----------------------------------------  ---------------------------------------- */
 }

liquidnet-bus-service/liquidnet-service-goblin/liquidnet-service-goblin-impl/src/main/java/com/liquidnet/service/goblin/util/GoblinRedisUtils.java

@@ -1544,6 +1544,9 @@ public class GoblinRedisUtils {
 
     /* ---------------------------------------- 我的藏品 ---------------------------------------- */
 
+    /**
+     * 获取用户藏品ID集合
+     */
     public List<String> getUserDigitalArtworkIds(String uid) {
         return (List<String>) redisUtil.get(GoblinRedisConst.USER_DIGITAL_ARTWORK_IDS.concat(uid));
     }
@@ -1561,6 +1564,9 @@ public class GoblinRedisUtils {
         return (GoblinUserDigitalArtworkVo) redisUtil.get(GoblinRedisConst.USER_DIGITAL_ARTWORK.concat(artworkId));
     }
 
+    /**
+     * 缓存用户藏品详情
+     */
     public boolean setUserDigitalArtworkVo(GoblinUserDigitalArtworkVo vo) {
         return redisUtil.set(GoblinRedisConst.USER_DIGITAL_ARTWORK.concat(vo.getArtworkId()), vo);
     }
@@ -1573,6 +1579,40 @@ public class GoblinRedisUtils {
         return redisUtil.set(GoblinRedisConst.USER_DIGITAL_ARTWORK.concat(vo.getArtworkId()), vo, 259200);
     }
 
+    /* ----------------------------------- 我的藏品生成 ----------------------------------- */
+
+    /**
+     * 标记订单藏品生成
+     */
+    public boolean markGenUserDigitalArtwork(String uid, String skuId, String orderId) {
+        return redisUtil.set(GoblinRedisConst.USER_DIGITAL_ARTWORK_GENMARK.concat(uid).concat(skuId).concat(orderId), 1, 259200);
+    }
+
+    /**
+     * 判断订单藏品生成
+     */
+    public boolean hasGenUserDigitalArtwork(String uid, String skuId, String orderId) {
+        return redisUtil.hasKey(GoblinRedisConst.USER_DIGITAL_ARTWORK_GENMARK.concat(uid).concat(skuId).concat(orderId));
+    }
+
+    /**
+     * 缓存并更新用户藏品ID集合
+     */
+    public boolean addUserDigitalArtworkIds(String uid, String artworkId) {
+        List<String> ids = this.getUserDigitalArtworkIds(uid);
+        if (CollectionUtils.isEmpty(ids)) {
+            ids = CollectionUtil.arrayListString();
+            ids.add(artworkId);
+        } else {
+            ids.add(0, artworkId);
+            int size = ids.size();
+            if (size > 30) ids.remove(size - 1);
+        }
+        return redisUtil.set(GoblinRedisConst.USER_DIGITAL_ARTWORK_IDS.concat(uid), ids);
+    }
+
+    /* ----------------------------------- ---------- ----------------------------------- */
+
     // 记录用户开通数字账户
     public void setNftNumAccount(String userId) {
         String redisKey = GoblinRedisConst.REDIS_GOBLIN_NFT_NUM_ACCOUNT.concat(userId);

liquidnet-bus-service/liquidnet-service-goblin/liquidnet-service-goblin-impl/src/main/resources/sqlmap.properties

@@ -130,6 +130,7 @@ goblin_store_coupon_rule.update_del=UPDATE goblin_store_coupon_rule SET del_flg=
 goblin_user_coupon.insert=INSERT INTO goblin_user_coupon (ucoupon_id, store_coupon_id, uid, state, bind_at, dued_at, operator, created_at)VALUES(?,?,?,?,?,?,?,?) 
 goblin_user_coupon.updateState=UPDATE goblin_user_coupon SET state = ? , used_for = ? ,updated_at = ? where ucoupon_id = ?
 #---- \u6211\u7684\u85CF\u54C1
+goblin_user_digital_artwork.insert=INSERT INTO goblin_user_digital_artwork (artwork_id, sku_id, uid, order_id, source, state, created_at)VALUES(?,?,?,?,?,?,?) 
 goblin_user_digital_artwork.update_for_chain=UPDATE goblin_user_digital_artwork SET edition_sn=?,nft_id=?,release_txhash=?,release_at=?,trading_txhash=?,trading_at=?,state=?,updated_at=? WHERE artwork_id=? AND state<>1 
 goblin_user_digital_artwork.update_for_unboxing=UPDATE goblin_user_digital_artwork SET state=1,del_flg='1',opening_at=?,updated_at=?,deleted_at=? WHERE artwork_id=? AND state<>1 
 #----

liquidnet-bus-service/liquidnet-service-order/liquidnet-service-order-impl/src/main/java/com/liquidnet/service/order/service/impl/GoblinNftOrderServiceImpl.java

 package com.liquidnet.service.order.service.impl;
 
 import com.fasterxml.jackson.core.type.TypeReference;
+import com.fasterxml.jackson.databind.node.ObjectNode;
 import com.liquidnet.commons.lang.util.*;
 import com.liquidnet.service.base.ResponseDto;
 import com.liquidnet.service.base.SqlMapping;
@@ -645,12 +646,13 @@ public class GoblinNftOrderServiceImpl implements IGoblinNftOrderService {
                         SqlMapping.gets(sqls, sqlDataOrder));
 
                 // 通知生成藏品
-                GoblinQueueBizArtworkGenDto artworkGenDto = GoblinQueueBizArtworkGenDto.getNew();
-                artworkGenDto.setOrderId(orderId);
-                artworkGenDto.setUid(uid);
-                artworkGenDto.setSkuId(orderVo.getSkuId());
-                artworkGenDto.setSource(1);
-                queueUtils.sendMsgByRedis(MQConst.GoblinQueue.BIZ_ARTWORK_GEN.getKey(), artworkGenDto.toJson());
+//                GoblinQueueBizArtworkGenDto artworkGenDto = GoblinQueueBizArtworkGenDto.getNew();
+//                artworkGenDto.setOrderId(orderId);
+//                artworkGenDto.setUid(uid);
+//                artworkGenDto.setSkuId(orderVo.getSkuId());
+//                artworkGenDto.setSource(1);
+//                queueUtils.sendMsgByRedis(MQConst.GoblinQueue.BIZ_ARTWORK_GEN.getKey(), artworkGenDto.toJson());
+                this.generateUserArtwork(orderVo);
 
                 // 增加销量
                 goblinRedisUtils.incrSkuSaleCount(orderVo.getSpuId(), orderVo.getSkuId(), orderVo.getNum());
@@ -730,4 +732,60 @@ public class GoblinNftOrderServiceImpl implements IGoblinNftOrderService {
         }
         return "success";
     }
+
+    /* --------------------------------------------------------------------------------- */
+
+    /**
+     * 生成我的藏品
+     *
+     * @param orderVo
+     */
+    private void generateUserArtwork(GoblinNftOrderVo orderVo) {
+        String uid = orderVo.getUserId(), skuId = orderVo.getSkuId(), orderId = orderVo.getOrderId(), spuId = orderVo.getSpuId();
+        Integer source = 1;
+        if (goblinRedisUtils.hasGenUserDigitalArtwork(uid, skuId, orderId)) {// 已生成
+            log.warn("#GEN_ARTWORK EXIST_ART[uid={},skuId={},orderId={},source={}]", uid, skuId, orderId, source);
+            return;
+        }
+        GoblinGoodsInfoVo goodsInfoVo = goblinRedisUtils.getGoodsInfoVo(spuId);
+        LocalDateTime now = LocalDateTime.now();
+
+        GoblinUserDigitalArtworkVo digitalArtworkVo = GoblinUserDigitalArtworkVo.getNew();
+        String artworkId = IDGenerator.nextMilliId2();
+        digitalArtworkVo.setArtworkId(artworkId);
+        digitalArtworkVo.setSkuId(skuId);
+        digitalArtworkVo.setUid(uid);
+        digitalArtworkVo.setOrderId(orderId);
+        digitalArtworkVo.setSource(source);
+        digitalArtworkVo.setState(0);
+        digitalArtworkVo.setDelFlg("0");
+        digitalArtworkVo.setCreatedAt(now);
+        digitalArtworkVo.setAuthor(goodsInfoVo.getAuthor());
+        digitalArtworkVo.setPublisher(goodsInfoVo.getPublisher());
+
+        // Mongo记录VO
+        goblinMongoUtils.insertGoblinUserDigitalArtworkVo(digitalArtworkVo);
+        // Redis记录VO
+        goblinRedisUtils.setGoblinUserDigitalArtworkVo(digitalArtworkVo);
+        // Redis更新藏品ID列表
+        goblinRedisUtils.addGoblinUserDigitalArtworkIds(uid, artworkId);
+        // 缓存用户藏品数
+        goblinRedisUtils.incrGoblinUserDigitalArtworks(uid);
+        // Redis生成标记（缓存三天），用于上面的生成检查
+        goblinRedisUtils.markGenUserDigitalArtwork(uid, skuId, orderId);
+
+        GoblinGoodsSkuInfoVo goodsSkuInfoVo = goblinRedisUtils.getGoodsSkuInfoVo(skuId);
+        if ("0".equals(goodsSkuInfoVo.getUnbox())) {// 非盲盒，NFT发行购买
+            ObjectNode bizNftBuyNode = JsonUtils.OM().createObjectNode().put("nftOrderPayId", orderId).put("routerType", goodsSkuInfoVo.getRouteType())
+                    .put("skuId", skuId).put("userId", uid).put("buyTimestamp", DateUtil.Formatter.yyyyMMddHHmmss.format(now));;
+            queueUtils.sendMsgByRedis(MQConst.GalaxyQueue.JSON_NFT_PUBLISH_AND_BUY.getKey(), bizNftBuyNode.toString());
+        }
+
+        // Mysql持久化
+        LinkedList<String> toMqSqls = CollectionUtil.linkedListString();
+        toMqSqls.add(SqlMapping.get("goblin_user_digital_artwork.insert"));
+        LinkedList<Object[]> initUserDigitalArtworkObjs = CollectionUtil.linkedListObjectArr();
+        initUserDigitalArtworkObjs.add(new Object[]{digitalArtworkVo.getArtworkId(), skuId, uid, orderId, source, digitalArtworkVo.getState(), now});
+        queueUtils.sendMsgByRedis(MQConst.GoblinQueue.SQL_ARTWORK_GEN.getKey(), SqlMapping.gets(toMqSqls, initUserDigitalArtworkObjs));
+    }
 }

liquidnet-bus-service/liquidnet-service-order/liquidnet-service-order-impl/src/main/java/com/liquidnet/service/order/utils/GoblinMongoUtils.java

@@ -136,4 +136,10 @@ public class GoblinMongoUtils {
                 object);
     }
 
+    /**
+     * 记录用户藏品数据
+     */
+    public void insertGoblinUserDigitalArtworkVo(GoblinUserDigitalArtworkVo vo) {
+        mongoTemplate.insert(vo, GoblinUserDigitalArtworkVo.class.getSimpleName());
+    }
 }

liquidnet-bus-service/liquidnet-service-order/liquidnet-service-order-impl/src/main/java/com/liquidnet/service/order/utils/GoblinRedisUtils.java

@@ -4,15 +4,9 @@ import com.fasterxml.jackson.core.type.TypeReference;
 import com.liquidnet.common.cache.redis.util.RedisUtil;
 import com.liquidnet.commons.lang.util.CollectionUtil;
 import com.liquidnet.commons.lang.util.JsonUtils;
-import com.liquidnet.commons.lang.util.RandomUtil;
 import com.liquidnet.service.goblin.constant.GoblinRedisConst;
 import com.liquidnet.service.goblin.constant.GoblinStatusConst;
-import com.liquidnet.service.goblin.dto.GoblinStoreMarketDto;
-import com.liquidnet.service.goblin.dto.manage.vo.GoblinMgtCategorySpecVo;
 import com.liquidnet.service.goblin.dto.vo.*;
-import com.liquidnet.service.goblin.entity.GoblinFrontBanner;
-import com.liquidnet.service.goblin.entity.GoblinFrontHotWord;
-import com.liquidnet.service.goblin.entity.GoblinFrontNavigation;
 import com.liquidnet.service.kylin.constant.KylinRedisConst;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
@@ -20,11 +14,8 @@ import org.springframework.util.CollectionUtils;
 import org.springframework.util.StringUtils;
 
 import java.time.LocalDateTime;
-import java.util.ArrayList;
 import java.util.List;
 
-import static com.liquidnet.service.goblin.constant.GoblinRedisConst.REDIS_GOBLIN_TEMP_COUPON_MARKET;
-
 @Component
 public class GoblinRedisUtils {
     @Autowired
@@ -410,4 +401,68 @@ public class GoblinRedisUtils {
             return true;
         }
     }
+
+    /* ----------------------------------- 我的藏品生成 ----------------------------------- */
+
+    /**
+     * 标记订单藏品生成
+     */
+    public boolean markGenUserDigitalArtwork(String uid, String skuId, String orderId) {
+        return redisUtil.set(GoblinRedisConst.USER_DIGITAL_ARTWORK_GENMARK.concat(uid).concat(skuId).concat(orderId), 1, 259200);
+    }
+
+    /**
+     * 判断订单藏品生成
+     */
+    public boolean hasGenUserDigitalArtwork(String uid, String skuId, String orderId) {
+        return redisUtil.hasKey(GoblinRedisConst.USER_DIGITAL_ARTWORK_GENMARK.concat(uid).concat(skuId).concat(orderId));
+    }
+
+    /**
+     * 缓存用户藏品详情
+     */
+    public boolean setGoblinUserDigitalArtworkVo(GoblinUserDigitalArtworkVo vo) {
+        return redisUtil.set(GoblinRedisConst.USER_DIGITAL_ARTWORK.concat(vo.getArtworkId()), vo);
+    }
+
+    /**
+     * 获取用户藏品ID集合
+     */
+    public List<String> getGoblinUserDigitalArtworkIds(String uid) {
+        return (List<String>) redisUtil.get(GoblinRedisConst.USER_DIGITAL_ARTWORK_IDS.concat(uid));
+    }
+
+    /**
+     * 缓存用户藏品ID集合
+     */
+    public boolean setGoblinUserDigitalArtworkIds(String uid, List<String> userDigitalArtworkIds) {
+        return redisUtil.set(GoblinRedisConst.USER_DIGITAL_ARTWORK_IDS.concat(uid), userDigitalArtworkIds);
+    }
+
+    /**
+     * 缓存并更新用户藏品ID集合
+     */
+    public boolean addGoblinUserDigitalArtworkIds(String uid, String artworkId) {
+        List<String> ids = this.getGoblinUserDigitalArtworkIds(uid);
+        if (CollectionUtils.isEmpty(ids)) {
+            ids = CollectionUtil.arrayListString();
+            ids.add(artworkId);
+        } else {
+            ids.add(0, artworkId);
+            int size = ids.size();
+            if (size > 30) ids.remove(size - 1);
+        }
+        return redisUtil.set(GoblinRedisConst.USER_DIGITAL_ARTWORK_IDS.concat(uid), ids);
+    }
+
+    /**
+     * 缓存用户累计藏品数
+     */
+    public long incrGoblinUserDigitalArtworks(String uid) {
+        return redisUtil.incr(GoblinRedisConst.USER_DIGITAL_ARTWORK_CT.concat(uid), 1);
+    }
+
+    /* ----------------------------------- ---------- ----------------------------------- */
+
+    /* -----------------------------------  ----------------------------------- */
 }