~api:生成我的藏品更新藏品订单（关联藏品ID）;

liquidnet-bus-common/liquidnet-common-service-base/src/main/java/com/liquidnet/service/base/MdbMessage.java

@@ -32,8 +32,13 @@ public class MdbMessage implements Serializable, Cloneable {
     private static final MdbMessage obj = new MdbMessage();
 
     public static MdbMessage getNew() {
+        return obj.clone();
+    }
+
+    @Override
+    public MdbMessage clone() {
         try {
-            return (MdbMessage) obj.clone();
+            return (MdbMessage) super.clone();
         } catch (CloneNotSupportedException e) {
             return new MdbMessage();
         }

liquidnet-bus-common/liquidnet-common-service-base/src/main/java/com/liquidnet/service/base/SmsMessage.java

@@ -42,8 +42,13 @@ public class SmsMessage implements Serializable, Cloneable {
     private final static SmsMessage instance = new SmsMessage();
 
     public static SmsMessage builder() {
+        return instance.clone();
+    }
+
+    @Override
+    public SmsMessage clone() {
         try {
-            return (SmsMessage) instance.clone();
+            return (SmsMessage) super.clone();
         } catch (CloneNotSupportedException e) {
             return new SmsMessage();
         }

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

@@ -2,6 +2,7 @@ package com.liquidnet.service.goblin.service.impl;
 
 import com.fasterxml.jackson.databind.node.ObjectNode;
 import com.liquidnet.commons.lang.util.*;
+import com.liquidnet.service.base.MdbMessage;
 import com.liquidnet.service.base.PagedResult;
 import com.liquidnet.service.base.ResponseDto;
 import com.liquidnet.service.base.SqlMapping;
@@ -250,6 +251,18 @@ public class GoblinUserDigitalArtworkServiceImpl implements IGoblinUserDigitalAr
             goblinRedisUtils.setUserDigitalArtworkVo(initUserDigitalArtworkVo);
             // Redis更新藏品ID列表
             goblinRedisUtils.addUserDigitalArtworkIdsForUnbox(uid, artworkId, userDigitalArtworkBoxVo.getArtworkId());
+            {// Redis更新藏品订单关联artworkId
+                orderVo.setArtworkId(artworkId);
+                goblinRedisUtils.setGoblinNftOrder(orderVo);
+                // Mongo同步更新藏品订单
+                MdbMessage mdbMessage = MdbMessage.getNew();
+                mdbMessage.setCollect(GoblinUserDigitalArtworkVo.class.getSimpleName());
+                mdbMessage.setColumn("artworkId");
+                mdbMessage.setBizId(userDigitalArtworkBoxVo.getArtworkId());
+                mdbMessage.setPrefix(GoblinRedisConst.USER_DIGITAL_ARTWORK);
+                mdbMessage.setOpType(2);
+                queueUtils.sendMsgByRedis(MQConst.GoblinQueue.BIZ_NFT_MONGO.getKey(), mdbMessage.toJson());
+            }
 
             if ("0".equals(unboxSkuInfoVo.getUnbox())) {// 非盲盒，NFT发行购买
                 ObjectNode bizNftBuyNode = JsonUtils.OM().createObjectNode().put("nftOrderPayId", orderId).put("routerType", unboxSkuInfoVo.getRouteType())
@@ -265,7 +278,10 @@ public class GoblinUserDigitalArtworkServiceImpl implements IGoblinUserDigitalAr
             toMqSqls.add(SqlMapping.get("goblin_user_digital_artwork.update_for_unboxing"));
             LinkedList<Object[]> updateBoxArtworkObjs = CollectionUtil.linkedListObjectArr();
             updateBoxArtworkObjs.add(new Object[]{now, now, now, userDigitalArtworkBoxVo.getArtworkId()});
-            queueUtils.sendMsgByRedis(MQConst.GoblinQueue.SQL_ARTWORK_GEN.getKey(), SqlMapping.gets(toMqSqls, initUserDigitalArtworkObjs, updateBoxArtworkObjs));
+            toMqSqls.add(SqlMapping.get("goblin_nft_order.update_artwork"));
+            LinkedList<Object[]> updateNftOrderObjs = CollectionUtil.linkedListObjectArr();
+            updateNftOrderObjs.add(new Object[]{artworkId, orderId});
+            queueUtils.sendMsgByRedis(MQConst.GoblinQueue.SQL_ARTWORK_GEN.getKey(), SqlMapping.gets(toMqSqls, initUserDigitalArtworkObjs, updateBoxArtworkObjs, updateNftOrderObjs));
 
             // Mongo同步更新
             GoblinQueueBizMongoDto goblinQueueBizMongoDto = GoblinQueueBizMongoDto.getNew();

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

@@ -1505,6 +1505,11 @@ public class GoblinRedisUtils {
         }
     }
 
+    // 缓存 nft订单相关vo
+    public boolean setGoblinNftOrder(GoblinNftOrderVo vo) {
+        return redisUtil.set(GoblinRedisConst.REDIS_GOBLIN_NFT_ORDER_INFO.concat(vo.getOrderId()), vo);
+    }
+
     // 获取 订单相关Skuvo
     public GoblinOrderSkuVo getGoblinOrderSkuVo(String orderSkuId) {
         String redisKey = GoblinRedisConst.REDIS_GOBLIN_ORDER_SKU.concat(orderSkuId);

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

@@ -147,7 +147,7 @@ goblin_goods_anticipate_user_update=UPDATE goblin_goods_anticipate_user SET stat
 goblin_goods_anticipate_user_update_sku=UPDATE goblin_goods_anticipate_user SET state = 1 WHERE sku_id = ? 
 goblin_goods_anticipate_mix=INSERT INTO goblin_goods_anticipate_mix ( mid, uid, phone, mix_id, state, created_date ) VALUES(?,?,?,?,0,NOW())
 #----       \u4E1A\u52A1\u8D26\u53F7\u8BB0\u5F55
-adam_user_busi_acct.add=INSERT INTO adam_user_busi_acct (`uid`, busi, uuid, `work`, ppwd, `state`, created_at) VALUES (?,?,?,?,?,?,?)
+adam_user_busi_acct.add=INSERT INTO adam_user_busi_acct (`uid`,busi,uuid,`work`,ppwd,`state`,created_at) VALUES (?,?,?,?,?,?,?)
 #----              \u9ED1\u767D\u540D\u5355             ----
 goblin_list_insert=INSERT INTO goblin_list (`list_id`,`uid`,`name`,`white_type`,`white_url`,`time_start`,`time_end`,`tag_type`,`black_url`,`created_at`) VALUES (?,?,?,?,?,?,?,?,?,?)
 goblin_list_detail_insert=INSERT INTO goblin_list_details (`list_id`,`spu_id`,`sku_id`,`created_at`,`sku_stock`,`price_v`,`product_id`,`price`) VALUES (?,?,?,?,?,?,?,?)
@@ -160,7 +160,8 @@ goblin_mix_status_update=UPDATE goblin_mix SET status = ? , updated_at = ? WHERE
 goblin_mix_update=UPDATE goblin_mix SET show_position = ? , `limit`=?,white_type=?,white_url=? , updated_at = ?,shelves_time = ?,reserve = ? WHERE mix_id = ?
 #----                   \u7528\u6237\u5B89\u5168\u8BBE\u7F6E
 goblin_user_safe_config.add_passwd=INSERT INTO goblin_user_safe_config (uid,passwd,created_at)VALUES(?,?,?) 
-#----
+#----                   \u85CF\u54C1\u8BA2\u5355\u5173\u8054\u85CF\u54C1ID
+goblin_nft_order.update_artwork=UPDATE goblin_nft_order SET artwork_id=? WHERE order_id=? AND artwork_id is null 
 #----
 #----
 #----

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

@@ -42,6 +42,8 @@ public class GoblinNftOrderUtils {
     @Autowired
     private GoblinRedisUtils goblinRedisUtils;
     @Autowired
+    private GoblinNftOrderUtils goblinNftOrderUtils;
+    @Autowired
     private RedisUtil redisUtil;
     @Autowired
     private GoblinMongoUtils goblinMongoUtils;
@@ -636,6 +638,13 @@ public class GoblinNftOrderUtils {
         goblinRedisUtils.incrGoblinUserDigitalArtworks(uid);
         // Redis生成标记（缓存三天），用于上面的生成检查
         goblinRedisUtils.markGenUserDigitalArtwork(uid, skuId, orderId);
+        {// Redis更新藏品订单关联artworkId
+            orderVo.setArtworkId(artworkId);
+            goblinNftOrderUtils.setNftOrder(orderVo);
+            // Mongo同步更新藏品订单
+            goblinOrderUtils.setMongoList(GoblinNftOrderVo.class.getSimpleName(), "orderId", orderVo.getOrderId(), GoblinRedisConst.REDIS_GOBLIN_NFT_ORDER_INFO, 2);
+        }
+
         // Mongo记录VO
         goblinOrderUtils.setMongoList(GoblinUserDigitalArtworkVo.class.getSimpleName(), "artworkId", digitalArtworkVo.getArtworkId(), GoblinRedisConst.USER_DIGITAL_ARTWORK, 1);
 //        goblinMongoUtils.insertGoblinUserDigitalArtworkVo(digitalArtworkVo);
@@ -657,6 +666,9 @@ public class GoblinNftOrderUtils {
         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));
+        toMqSqls.add(SqlMapping.get("goblin_nft_order.update_artwork"));
+        LinkedList<Object[]> updateNftOrderObjs = CollectionUtil.linkedListObjectArr();
+        updateNftOrderObjs.add(new Object[]{artworkId, orderId});
+        queueUtils.sendMsgByRedis(MQConst.GoblinQueue.SQL_ARTWORK_GEN.getKey(), SqlMapping.gets(toMqSqls, initUserDigitalArtworkObjs, updateNftOrderObjs));
     }
 }

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

@@ -56,13 +56,13 @@ goblin_user_digital_artwork.insert=INSERT INTO goblin_user_digital_artwork (artw
 goblin_nft_ex_code.update=UPDATE goblin_nft_ex_code SET state = ?, redeem_uid = ?, redeem_at = ?, updated_at = ? WHERE code_id = ?
 
 #----dragon ------
-# ------------------------创建退款订单----------------------------
+# ------------------------\u00E5\u0088\u009B\u00E5\u00BB\u00BA\u00E9\u0080\u0080\u00E6\u00AC\u00BE\u00E8\u00AE\u00A2\u00E5\u008D\u0095----------------------------
 dragon_order_refund.insert=INSERT INTO `dragon_order_refunds`(`order_refund_id`,`code` ,`order_refund_code` ,`price` ,`reason` ,`notify_url` ,`refund_type`,`created_at`,`updated_at`)VALUES(?,?,?,?,?,?,?,?,?);
-# ------------------------修改退款订单----------------------------
+# ------------------------\u00E4\u00BF\u00AE\u00E6\u0094\u00B9\u00E9\u0080\u0080\u00E6\u00AC\u00BE\u00E8\u00AE\u00A2\u00E5\u008D\u0095----------------------------
 dragon_order_refund_error.update=UPDATE `dragon_order_refunds` SET updated_at = ? , refund_error=? , status=?   WHERE order_refund_code = ? 
 dragon_order_refund_success.update=UPDATE `dragon_order_refunds` SET updated_at = ? , refund_at=? , status=?   WHERE order_refund_code = ?
 dragon_order_refund_call_back.update=UPDATE `dragon_order_refunds` SET updated_at = ? , finished_at=? , status=?   WHERE order_refund_code = ?
-# ------------------------创建退款订单日志----------------------------
+# ------------------------\u00E5\u0088\u009B\u00E5\u00BB\u00BA\u00E9\u0080\u0080\u00E6\u00AC\u00BE\u00E8\u00AE\u00A2\u00E5\u008D\u0095\u00E6\u0097\u00A5\u00E5\u00BF\u0097----------------------------
 dragon_order_refund_log.insert=INSERT INTO `dragon_order_refund_logs`(`order_refund_id` ,`refund_type` ,`content`,`created_at`,`updated_at`)VALUES(?,?,?,?,?);
 
 dragon_orders.insert=insert into dragon_orders(order_id, status, code, type, price, name, detail, order_code, order_code_id, client_ip, notify_url,notify_status, payment_type, payment_id, payment_at, finished_at, created_at, updated_at, deleted_at,receipt_data) values(?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)
@@ -71,5 +71,7 @@ dragon_pay_notify.insert=insert into dragon_pay_notify (code, order_code, notify
 dragon_pay_notify_fail.insert=insert into dragon_pay_notify_fail (code, order_code, notify_url, notify_data, fail_desc, created_at, updated_at) values(?,?,?,?,?,?,?)
 
 dragon_orders.updateOrderStatus=update dragon_orders t set t.status = ?  ,t.payment_id = ?,t.finished_at = ?,t.updated_at =? where t.code = ?
-dragon_orders.updateNotifyStatus=update dragon_orders t set t.notify_status = ? ,t.updated_at =? where t.code = ?
-
+dragon_orders.updateNotifyStatus=update dragon_orders t set t.notify_status = ? ,t.updated_at =? where t.code = ? 
+#----                   \u85CF\u54C1\u8BA2\u5355\u5173\u8054\u85CF\u54C1ID
+goblin_nft_order.update_artwork=UPDATE goblin_nft_order SET artwork_id=? WHERE order_id=? AND artwork_id is null 
+#----