~api:藏品详情:转赠过期时间设置+条件;

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

@@ -208,10 +208,13 @@ public class GoblinUserDigitalArtworkServiceImpl implements IGoblinUserDigitalAr
             artworkInfoVo.setSkuWatchPic(goodsSkuInfoVo.getSkuWatchPic());
             artworkInfoVo.setRouteType(goodsSkuInfoVo.getRouteType());
 
-            boolean transferFlg = StringUtils.isNotEmpty(userDigitalArtworkVo.getTransferState());
+            String transferState = userDigitalArtworkVo.getTransferState();
+            boolean transferFlg = StringUtils.isNotEmpty(transferState);
             if (transferFlg) {// 发生转赠
                 artworkInfoVo.setTransferTime(userDigitalArtworkVo.getTransferAt());
-                artworkInfoVo.setTransferExpireTime(userDigitalArtworkVo.getTransferAt().plusDays(1));
+                if (transferState.equals(GoblinStatusConst.TransferState.PENDING.name()) && null != userDigitalArtworkVo.getTransferAt()) {
+                    artworkInfoVo.setTransferExpireTime(userDigitalArtworkVo.getTransferAt().plusDays(1));
+                }
             }
             if ("0".equals(goodsSkuInfoVo.getUnbox()) && 1 == userDigitalArtworkVo.getState() && !transferFlg) {// 非盲盒 & 已上链 & 非转赠（转赠中、已转赠）
                 artworkInfoVo.setMaterialType(goodsSkuInfoVo.getMaterialType());