~api:藏品转赠文案调整，语法调整;

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

@@ -99,6 +99,7 @@ public class GoblinUserDigitalArtworkController {
         }
 
         if (!goblinRedisUtils.lockUserDigitalArtworkVoOperate(artworkId)) return ResponseDto.failure(ErrorMapping.get("140000"));
+        try {
             GoblinUserDigitalArtworkListVo unboxingRstVo = null;
             try {
                 switch (userDigitalArtworkVo.getSource()) {
@@ -114,8 +115,10 @@ public class GoblinUserDigitalArtworkController {
             } catch (Exception e) {
                 log.error("Ex.开启盲盒异常[artworkId={},uid={}]", artworkId, currentUid);
             }
-        goblinRedisUtils.unlockUserDigitalArtworkVoOperate(artworkId);
             return null == unboxingRstVo ? ResponseDto.failure(ErrorMapping.get("140102")) : ResponseDto.success(unboxingRstVo);
+        } finally {
+            goblinRedisUtils.unlockUserDigitalArtworkVoOperate(artworkId);
+        }
     }
 
     @ApiOperationSupport(order = 4)
@@ -135,9 +138,12 @@ public class GoblinUserDigitalArtworkController {
         if (5 != acceptState) return ResponseDto.success(acceptState);// 非待收取状态，直接返回藏品状态
 
         if (!goblinRedisUtils.lockUserDigitalArtworkVoOperate(artworkId)) return ResponseDto.failure(ErrorMapping.get("140000"));
+        try {
             boolean acceptRstFlg = goblinUserDigitalArtworkService.accept(currentUid, userDigitalArtworkVo);
-        goblinRedisUtils.unlockUserDigitalArtworkVoOperate(artworkId);
             return acceptRstFlg ? ResponseDto.success(0) : ResponseDto.failure(ErrorMapping.get("140002"));
+        } finally {
+            goblinRedisUtils.unlockUserDigitalArtworkVoOperate(artworkId);
+        }
     }
 
     @ApiOperationSupport(order = 5)
@@ -157,18 +163,6 @@ public class GoblinUserDigitalArtworkController {
         ResponseDto<String> validUserSafePasswdResponseDto = goblinRedisUtils.validUserSafePasswd(safePasswd, userSafeConfigDto, currentUid);
         if (!validUserSafePasswdResponseDto.isSuccess()) return validUserSafePasswdResponseDto;// 安全密码验证不通过
 
-        GoblinUserDigitalArtworkVo userDigitalArtworkVo = goblinRedisUtils.getUserDigitalArtworkVo(artworkId);
-        if (null == userDigitalArtworkVo || !currentUid.equals(userDigitalArtworkVo.getUid()) || userDigitalArtworkVo.getDelFlg().equals("1")) {
-            return ResponseDto.failure(ErrorMapping.get("140105"));
-        }
-        GoblinGoodsSkuInfoVo goodsSkuInfoVo = goblinRedisUtils.getGoodsSkuInfoVo(userDigitalArtworkVo.getSkuId());
-        if ("1".equals(goodsSkuInfoVo.getUnbox())) return ResponseDto.failure(ErrorMapping.get("140106"));// 盲盒
-        if (1 != userDigitalArtworkVo.getState()) return ResponseDto.failure(ErrorMapping.get("140107"));// 未上链
-        Map<String, Long> transferConfMap = goblinRedisUtils.getUserDigitalArtworkTransferConfMap(userDigitalArtworkVo.getSource());
-        LocalDateTime transferAllowTime = DateUtil.Formatter.yyyyMMddHHmmss.parse(userDigitalArtworkVo.getTradingAt()).plusSeconds(transferConfMap.get(goodsSkuInfoVo.getRouteType()));
-        if (!transferConfMap.containsKey(goodsSkuInfoVo.getRouteType())) return ResponseDto.failure(ErrorMapping.get("140111"));// 区块链路由未开放转赠
-        if (transferAllowTime.isAfter(LocalDateTime.now())) return ResponseDto.failure(ErrorMapping.get("140112"));// 转赠过渡期内不可转赠
-        if (StringUtils.isNotEmpty(userDigitalArtworkVo.getTransferState())) return ResponseDto.success(userDigitalArtworkVo.getTransferState());// 转赠状态不为空，标记已转赠或转赠中
         String[] receiverArr;
         try {
             receiverArr = DESUtils.DES().decrypt(receiver).split(",");
@@ -181,9 +175,24 @@ public class GoblinUserDigitalArtworkController {
         if (null == receiverAcctInfo || !"2000".equals(receiverAcctInfo.getCode())) return ResponseDto.failure(ErrorMapping.get("140110"));// 未开通数字账户
 
         if (!goblinRedisUtils.lockUserDigitalArtworkVoOperate(artworkId)) return ResponseDto.failure(ErrorMapping.get("140000"));
+        try {
+            GoblinUserDigitalArtworkVo userDigitalArtworkVo = goblinRedisUtils.getUserDigitalArtworkVo(artworkId);
+            if (null == userDigitalArtworkVo || !currentUid.equals(userDigitalArtworkVo.getUid()) || userDigitalArtworkVo.getDelFlg().equals("1")) {
+                return ResponseDto.failure(ErrorMapping.get("140105"));
+            }
+            GoblinGoodsSkuInfoVo goodsSkuInfoVo = goblinRedisUtils.getGoodsSkuInfoVo(userDigitalArtworkVo.getSkuId());
+            if ("1".equals(goodsSkuInfoVo.getUnbox())) return ResponseDto.failure(ErrorMapping.get("140106"));// 盲盒
+            if (1 != userDigitalArtworkVo.getState()) return ResponseDto.failure(ErrorMapping.get("140107"));// 未上链
+            Map<String, Long> transferConfMap = goblinRedisUtils.getUserDigitalArtworkTransferConfMap(userDigitalArtworkVo.getSource());
+            LocalDateTime transferAllowTime = DateUtil.Formatter.yyyyMMddHHmmss.parse(userDigitalArtworkVo.getTradingAt()).plusSeconds(transferConfMap.get(goodsSkuInfoVo.getRouteType()));
+            if (!transferConfMap.containsKey(goodsSkuInfoVo.getRouteType())) return ResponseDto.failure(ErrorMapping.get("140111"));// 区块链路由未开放转赠
+            if (transferAllowTime.isAfter(LocalDateTime.now())) return ResponseDto.failure(ErrorMapping.get("140112"));// 转赠过渡期内不可转赠
+            if (StringUtils.isNotEmpty(userDigitalArtworkVo.getTransferState())) return ResponseDto.failure(ErrorMapping.get("140121"));// 转赠状态不为空，标记已转赠或转赠中
             boolean transferRstFlg = goblinUserDigitalArtworkService.transfer(userDigitalArtworkVo, goodsSkuInfoVo.getRouteType(), receiverArr);
-        goblinRedisUtils.unlockUserDigitalArtworkVoOperate(artworkId);
             return transferRstFlg ? ResponseDto.success(GoblinStatusConst.TransferState.WAITING.name()) : ResponseDto.failure(ErrorMapping.get("140002"));
+        } finally {
+            goblinRedisUtils.unlockUserDigitalArtworkVoOperate(artworkId);
+        }
     }
 
     @ApiOperationSupport(order = 6)
@@ -205,9 +214,12 @@ public class GoblinUserDigitalArtworkController {
             return ResponseDto.failure(ErrorMapping.get(null == userDigitalArtworkVo.getTransferState() ? "140120" : "140119"));// 藏品已领取或已退还
         }
         if (!goblinRedisUtils.lockUserDigitalArtworkVoOperate(artworkId)) return ResponseDto.failure(ErrorMapping.get("140000"));
+        try {
             boolean transferReceiveRstFlg = goblinUserDigitalArtworkService.transferConfirmReceive(artworkId);
-        goblinRedisUtils.unlockUserDigitalArtworkVoOperate(artworkId);
             return transferReceiveRstFlg ? ResponseDto.success() : ResponseDto.failure(ErrorMapping.get("140002"));
+        } finally {
+            goblinRedisUtils.unlockUserDigitalArtworkVoOperate(artworkId);
+        }
     }
 
     @ApiOperationSupport(order = 6)
@@ -226,8 +238,11 @@ public class GoblinUserDigitalArtworkController {
             return ResponseDto.failure(ErrorMapping.get(null == userDigitalArtworkVo.getTransferState() ? "140120" : "140119"));// 藏品已领取
         }
         if (!goblinRedisUtils.lockUserDigitalArtworkVoOperate(artworkId)) return ResponseDto.failure(ErrorMapping.get("140000"));
+        try {
             boolean transferReceiveRstFlg = goblinUserDigitalArtworkService.transferConfirmReturn(artworkId);
-        goblinRedisUtils.unlockUserDigitalArtworkVoOperate(artworkId);
             return transferReceiveRstFlg ? ResponseDto.success() : ResponseDto.failure(ErrorMapping.get("140002"));
+        } finally {
+            goblinRedisUtils.unlockUserDigitalArtworkVoOperate(artworkId);
+        }
     }
 }

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

@@ -63,6 +63,7 @@
 140118=\u8BE5\u85CF\u54C1\u5DF2\u8FC7\u9886\u53D6\u6709\u6548\u671F
 140119=\u60A8\u5DF2\u9886\u53D6\u8BE5\u85CF\u54C1
 140120=\u8BE5\u85CF\u54C1\u5DF2\u9000\u8FD8
+140121=\u8BE5\u85CF\u54C1\u5DF2\u88AB\u8F6C\u8D60