~api:藏品转赠退还+SQL恢复藏品;

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

@@ -473,7 +473,7 @@ public class GoblinUserDigitalArtworkServiceImpl implements IGoblinUserDigitalAr
 
             // Mysql持久化
             LinkedList<String> toMqSqls = CollectionUtil.linkedListString();
-            toMqSqls.add(SqlMapping.get("goblin_user_digital_artwork.up_transfer_confirm"));
+            toMqSqls.add(SqlMapping.get("goblin_user_digital_artwork.up_transfer_receive"));
             LinkedList<Object[]> updateUserDigitalArtworkObjs = CollectionUtil.linkedListObjectArr();
             updateUserDigitalArtworkObjs.add(new Object[]{
                     userDigitalArtworkVo.getTransferState(), userDigitalArtworkVo.getUpdatedAt(), userDigitalArtworkVo.getArtworkId()
@@ -497,11 +497,12 @@ public class GoblinUserDigitalArtworkServiceImpl implements IGoblinUserDigitalAr
         if (goblinRedisUtils.rmvUserDigitalArtworkIdsTransfer(receiverUid, artworkId)) {
             LocalDateTime currentDateTime = LocalDateTime.now();
             // 转赠人藏品恢复
+            userDigitalArtworkVo.setUpdatedAt(currentDateTime);
             userDigitalArtworkVo.setTransferOrderId(null);
             userDigitalArtworkVo.setTransferState(null);
             userDigitalArtworkVo.setReceiverUid(null);
             userDigitalArtworkVo.setReceiverUser(null);
-            userDigitalArtworkVo.setUpdatedAt(currentDateTime);
+            userDigitalArtworkVo.setTransferAt(null);
             goblinRedisUtils.setUserDigitalArtworkVo(userDigitalArtworkVo);
 
             // Mongo藏品数据更新
@@ -509,6 +510,9 @@ public class GoblinUserDigitalArtworkServiceImpl implements IGoblinUserDigitalAr
 
             // Mysql转赠订单更新
             LinkedList<String> toMqSqls = CollectionUtil.linkedListString();
+            toMqSqls.add(SqlMapping.get("goblin_user_digital_artwork.up_transfer_return"));
+            LinkedList<Object[]> updateUserDigitalArtworkObjs = CollectionUtil.linkedListObjectArr();
+            updateUserDigitalArtworkObjs.add(new Object[]{userDigitalArtworkVo.getUpdatedAt(), userDigitalArtworkVo.getArtworkId()});
             toMqSqls.add(SqlMapping.get("goblin_nft_transfer_order.up_transfer_confirm"));// 藏品订单记录更新
             LinkedList<Object[]> updateNftTransferOrderObjs = CollectionUtil.linkedListObjectArr();
             updateNftTransferOrderObjs.add(new Object[]{2, currentDateTime, transferOrderId});

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

@@ -133,7 +133,8 @@ goblin_user_digital_artwork.update_for_chain=UPDATE goblin_user_digital_artwork
 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 
 goblin_user_digital_artwork.update_for_accept=UPDATE goblin_user_digital_artwork SET state=0,opening_at=?,updated_at=? WHERE artwork_id=? AND state=5 
 goblin_user_digital_artwork.up_transfer=UPDATE goblin_user_digital_artwork SET receiver_uid=?,transfer_order_id=?,transfer_state=?,updated_at=? WHERE artwork_id=? 
-goblin_user_digital_artwork.up_transfer_confirm=UPDATE goblin_user_digital_artwork SET transfer_state=?,updated_at=? WHERE artwork_id=? 
+goblin_user_digital_artwork.up_transfer_receive=UPDATE goblin_user_digital_artwork SET transfer_state=?,updated_at=? WHERE artwork_id=? 
+goblin_user_digital_artwork.up_transfer_return=UPDATE goblin_user_digital_artwork SET receiver_uid=null,transfer_order_id=null,transfer_state=null,updated_at=? WHERE artwork_id=? 
 goblin_user_digital_artwork.up_transfer_chain=UPDATE goblin_user_digital_artwork SET transfer_state=?,del_flg='1',deleted_at=? WHERE artwork_id=? 
 #---- \u85CF\u54C1\u8F6C\u8D60\u8BA2\u5355
 goblin_nft_transfer_order.insert=INSERT INTO goblin_nft_transfer_order (order_id,artwork_id,owner_uid,receiver_uid,state,created_at)VALUES(?,?,?,?,0,?)