~api:受赠藏品列表VO+藏品转赠过期时间;

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

@@ -131,6 +131,7 @@ public class GoblinUserDigitalArtworkServiceImpl implements IGoblinUserDigitalAr
 
         ArrayList<GoblinUserDigitalArtworkTransferListVo> listVos = ObjectUtil.getGoblinUserDigitalArtworkTransferListVos();
         Map<String, GoblinGoodsSkuInfoVo> tmpGoodsSkuInfoVoMap = ObjectUtil.getGoblinGoodsSkuInfoVoMap();
+        Map<String, Long> transferConfMap, transferConfFirstMap = null, transferConfAgainMap = null;
 
         for (String artworkId : artworkIdsTransferList) {
             GoblinUserDigitalArtworkVo userDigitalArtworkVo = goblinRedisUtils.getUserDigitalArtworkVo(artworkId);
@@ -161,6 +162,10 @@ public class GoblinUserDigitalArtworkServiceImpl implements IGoblinUserDigitalAr
             listVo.setOpeningTime(goodsSkuInfoVo.getOpeningTime());
             listVo.setRouteType(goodsSkuInfoVo.getRouteType());
 
+            if (null != userDigitalArtworkVo.getTransferAt()) {
+                listVo.setTransferExpireTime(userDigitalArtworkVo.getTransferAt().plusDays(1));
+            }
+
             listVos.add(listVo);
         }
         return listVos;
@@ -217,7 +222,7 @@ public class GoblinUserDigitalArtworkServiceImpl implements IGoblinUserDigitalAr
             boolean transferFlg = StringUtils.isNotEmpty(transferState);
             if (transferFlg) {// 发生转赠
                 artworkInfoVo.setTransferTime(userDigitalArtworkVo.getTransferAt());
-                if (transferState.equals(GoblinStatusConst.TransferState.WAITING.name()) && null != artworkInfoVo.getTransferTime()) {
+                if (GoblinStatusConst.TransferState.WAITING.name().equals(transferState) && null != artworkInfoVo.getTransferTime()) {
                     artworkInfoVo.setTransferExpireTime(artworkInfoVo.getTransferTime().plusDays(1));
                 }
                 if (uid.equals(userDigitalArtworkVo.getReceiverUid())) {// 受赠人查取详情返回转赠人UID，用于前端查取转赠人身份信息使用