~api;

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

@@ -183,7 +183,7 @@ public class GoblinUserDigitalArtworkController {
         if (!goblinRedisUtils.lockUserDigitalArtworkVoOperate(artworkId)) return ResponseDto.failure(ErrorMapping.get("140000"));
         boolean transferRstFlg = goblinUserDigitalArtworkService.transfer(userDigitalArtworkVo, goodsSkuInfoVo.getRouteType(), receiverArr);
         goblinRedisUtils.unlockUserDigitalArtworkVoOperate(artworkId);
-        return transferRstFlg ? ResponseDto.success(GoblinStatusConst.TransferState.PENDING.name()) : ResponseDto.failure(ErrorMapping.get("140002"));
+        return transferRstFlg ? ResponseDto.success(GoblinStatusConst.TransferState.WAITING.name()) : ResponseDto.failure(ErrorMapping.get("140002"));
     }
 
     @ApiOperationSupport(order = 6)

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

@@ -136,7 +136,13 @@ public class GoblinUserDigitalArtworkServiceImpl implements IGoblinUserDigitalAr
 
         for (String artworkId : artworkIdsTransferList) {
             GoblinUserDigitalArtworkVo userDigitalArtworkVo = goblinRedisUtils.getUserDigitalArtworkVo(artworkId);
-            if (null == userDigitalArtworkVo || !userDigitalArtworkVo.getReceiverUid().equals(uid)) {
+            if (
+                    null == userDigitalArtworkVo
+                            || null == userDigitalArtworkVo.getTransferState()
+                            || !userDigitalArtworkVo.getReceiverUid().equals(uid)
+                            || GoblinStatusConst.TransferState.SUCCESS.name().equals(userDigitalArtworkVo.getTransferState())
+                            || userDigitalArtworkVo.getTransferAt().plusDays(1).isBefore(LocalDateTime.now())
+            ) {
                 continue;
             }
 
@@ -312,7 +318,8 @@ public class GoblinUserDigitalArtworkServiceImpl implements IGoblinUserDigitalAr
 
         if ("0".equals(unboxSkuInfoVo.getUnbox())) {// 非盲盒，NFT发行购买
             ObjectNode bizNftBuyNode = JsonUtils.OM().createObjectNode().put("nftOrderPayId", orderId).put("routerType", unboxSkuInfoVo.getRouteType())
-                        .put("skuId", skuId).put("userId", uid).put("buyTimestamp", DateUtil.Formatter.yyyyMMddHHmmss.format(now));;
+                    .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());
         }
 

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

@@ -2141,7 +2141,7 @@ public class GoblinRedisUtils {
         } else {
             ids.add(0, artworkId);
         }
-        return redisUtil.set(GoblinRedisConst.USER_DIGITAL_ARTWORK_IDS_TRANSFER, ids);
+        return redisUtil.set(GoblinRedisConst.USER_DIGITAL_ARTWORK_IDS_TRANSFER.concat(uid), ids);
     }
 
     public boolean rmvUserDigitalArtworkIdsTransfer(String uid, String artworkId) {
@@ -2151,9 +2151,9 @@ public class GoblinRedisUtils {
         } else {
             ids.remove(artworkId);
             if (CollectionUtils.isEmpty(ids)) {
-                redisUtil.del(GoblinRedisConst.USER_DIGITAL_ARTWORK_IDS_TRANSFER);
+                redisUtil.del(GoblinRedisConst.USER_DIGITAL_ARTWORK_IDS_TRANSFER.concat(uid));
             } else {
-                redisUtil.set(GoblinRedisConst.USER_DIGITAL_ARTWORK_IDS_TRANSFER, ids);
+                redisUtil.set(GoblinRedisConst.USER_DIGITAL_ARTWORK_IDS_TRANSFER.concat(uid), ids);
             }
             return true;
         }

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

@@ -107,9 +107,9 @@ public class PlatformGoblinNftTransferOrderService extends ServiceImpl<GoblinNft
         } else {
             ids.remove(artworkId);
             if (CollectionUtils.isEmpty(ids)) {
-                redisDataSourceUtil.getRedisGoblinUtil().del(GoblinRedisConst.USER_DIGITAL_ARTWORK_IDS_TRANSFER);
+                redisDataSourceUtil.getRedisGoblinUtil().del(GoblinRedisConst.USER_DIGITAL_ARTWORK_IDS_TRANSFER.concat(uid));
             } else {
-                redisDataSourceUtil.getRedisGoblinUtil().set(GoblinRedisConst.USER_DIGITAL_ARTWORK_IDS_TRANSFER, ids);
+                redisDataSourceUtil.getRedisGoblinUtil().set(GoblinRedisConst.USER_DIGITAL_ARTWORK_IDS_TRANSFER.concat(uid), ids);
             }
             return true;
         }