~api:生成藏品重复代码处理;

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

@@ -792,7 +792,8 @@ public class GoblinNftOrderServiceImpl implements IGoblinNftOrderService {
 //                artworkGenDto.setSkuId(orderVo.getSkuId());
 //                artworkGenDto.setSource(1);
 //                queueUtils.sendMsgByRedis(MQConst.GoblinQueue.BIZ_ARTWORK_GEN.getKey(), artworkGenDto.toJson());
-                this.generateUserArtwork(orderVo, 1);
+                /*this.generateUserArtwork(orderVo, 1);*/
+                nftOrderUtils.generateUserArtwork(orderVo, 1);
                 // 增加销量
                 goblinRedisUtils.incrSkuSaleCount(orderVo.getSpuId(), orderVo.getSkuId(), orderVo.getNum());
                 // TODO: jxl 2022/4/24  判断技术部NFT记录Redis setBuyNftTec
@@ -976,9 +977,11 @@ public class GoblinNftOrderServiceImpl implements IGoblinNftOrderService {
                 goblinOrderUtils.integral(uid, orderVo.getPriceActual(), "购买数字藏品", 1);
                 // 生产藏品列表
                 if (code.equals(orderVo.getSkuId())) {
-                    this.generateUserArtwork(orderVo, 5);
+                    /*this.generateUserArtwork(orderVo, 5);*/
+                    nftOrderUtils.generateUserArtwork(orderVo, 5);
                 } else {
-                    this.generateUserArtwork(orderVo, orderType == 4 ? 31 : 2);
+                    /*this.generateUserArtwork(orderVo, orderType == 4 ? 31 : 2);*/
+                    nftOrderUtils.generateUserArtwork(orderVo, orderType == 4 ? 31 : 2);
                 }
                 // 增加销量
                 goblinRedisUtils.incrSkuSaleCount(orderVo.getSpuId(), orderVo.getSkuId(), orderVo.getNum());
@@ -1004,7 +1007,7 @@ public class GoblinNftOrderServiceImpl implements IGoblinNftOrderService {
      *
      * @param orderVo
      */
-    private void generateUserArtwork(GoblinNftOrderVo orderVo, Integer source) {
+    /*private void generateUserArtwork(GoblinNftOrderVo orderVo, Integer source) {
         String uid = orderVo.getUserId(), skuId = orderVo.getSkuId(), orderId = orderVo.getOrderId(), spuId = orderVo.getSpuId();
         if (goblinRedisUtils.hasGenUserDigitalArtwork(uid, skuId, orderId)) {// 已生成
             log.warn("#GEN_ARTWORK EXIST_ART[uid={},skuId={},orderId={},source={}]", uid, skuId, orderId, source);
@@ -1060,6 +1063,6 @@ public class GoblinNftOrderServiceImpl implements IGoblinNftOrderService {
         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/GoblinNftOrderUtils.java

@@ -617,7 +617,12 @@ public class GoblinNftOrderUtils {
         digitalArtworkVo.setUid(uid);
         digitalArtworkVo.setOrderId(orderId);
         digitalArtworkVo.setSource(source);
-        digitalArtworkVo.setState(source == 31 ? 5 : 0);
+        /*digitalArtworkVo.setState(source == 31 ? 5 : 0);*/
+        if (source == 5) {
+            digitalArtworkVo.setState(0);
+        } else {
+            digitalArtworkVo.setState(source == 31 ? 5 : 0);
+        }
         digitalArtworkVo.setDelFlg("0");
         digitalArtworkVo.setCreatedAt(now);
         digitalArtworkVo.setAuthor(goodsInfoVo.getAuthor());
@@ -640,7 +645,10 @@ public class GoblinNftOrderUtils {
             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());
+                /*queueUtils.sendMsgByRedis(MQConst.GalaxyQueue.JSON_NFT_PUBLISH_AND_BUY.getKey(), bizNftBuyNode.toString());*/
+                if (source != 5) {
+                    queueUtils.sendMsgByRedis(MQConst.GalaxyQueue.JSON_NFT_PUBLISH_AND_BUY.getKey(), bizNftBuyNode.toString());
+                }
             }
         }