~api:我的藏品列表+转赠允许时间;

liquidnet-bus-api/liquidnet-service-goblin-api/src/main/java/com/liquidnet/service/goblin/dto/vo/GoblinUserDigitalArtworkListVo.java

@@ -36,8 +36,6 @@ public class GoblinUserDigitalArtworkListVo implements Serializable, Cloneable {
     @ApiModelProperty(position = 19, value = "藏品创建时间")
     @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = DateUtil.DATE_FULL_STR)
     private LocalDateTime createdAt;
-    @ApiModelProperty(position = 19, value = "藏品数据链交易时间")
-    private String tradingAt;
 
     @ApiModelProperty(position = 20, value = "是否盲盒[0-否|1-是]")
     private String unbox;
@@ -51,8 +49,8 @@ public class GoblinUserDigitalArtworkListVo implements Serializable, Cloneable {
     private String routeType;
     @ApiModelProperty(position = 24, value = "转赠状态[PENDING|SUCCESS]")
     private String transferState;
-    @ApiModelProperty(position = 25, value = "转赠时间限制（单位秒）")
-    private Long transferTimeLimit;
+    @ApiModelProperty(position = 25, value = "转赠允许时间")
+    private LocalDateTime transferAllowTime;
 
 
     private static final GoblinUserDigitalArtworkListVo obj = new GoblinUserDigitalArtworkListVo();
@@ -76,7 +74,6 @@ public class GoblinUserDigitalArtworkListVo implements Serializable, Cloneable {
         this.setSource(source.getSource());
         this.setState(source.getState());
         this.setCreatedAt(source.getCreatedAt());
-        this.setTradingAt(source.getTradingAt());
 //        this.setUnbox();
 //        this.setOpeningTime();
 

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

@@ -76,7 +76,9 @@ public class GoblinUserDigitalArtworkServiceImpl implements IGoblinUserDigitalAr
                 return pageVo.setArtworkNum((int) artworkNum).setPagedResult(listVoPagedResult).setSystime(LocalDateTime.now());
             }
 
-            long transferTimeLimit = Long.parseLong(goblinRedisUtils.getUserDigitalArtworkTransferConf().get(0));
+            List<String> transferConfList = goblinRedisUtils.getUserDigitalArtworkTransferConf();
+            long transferTimeLimit = Long.parseLong(transferConfList.get(0));
+
             List<GoblinUserDigitalArtworkListVo> list = ObjectUtil.getGoblinUserDigitalArtworkListVoArrayList();
             LocalDateTime now = LocalDateTime.now(), toCheckTime = now.minusSeconds(15);
             for (int i = 0, subSize = subArtworkIdList.size(); i < subSize; i++) {
@@ -94,7 +96,6 @@ public class GoblinUserDigitalArtworkServiceImpl implements IGoblinUserDigitalAr
                 listVo.setUnbox(goodsSkuInfoVo.getUnbox());
                 listVo.setOpeningTime(goodsSkuInfoVo.getOpeningTime());
                 listVo.setRouteType(goodsSkuInfoVo.getRouteType());
-                listVo.setTransferTimeLimit(transferTimeLimit);
 
                 // 非盲盒 && 生成中 && 创建时间判断
                 if ("0".equals(listVo.getUnbox()) && 0 == listVo.getState() && listVo.getCreatedAt().isBefore(toCheckTime)) {// 15秒前创建的藏品，去主动核实发行交易状态
@@ -106,6 +107,10 @@ public class GoblinUserDigitalArtworkServiceImpl implements IGoblinUserDigitalAr
 //                    listVo.setCoverPic(goodsSkuInfoVo.getSkuPic());
 //                }
 
+                if (transferConfList.contains(goodsSkuInfoVo.getRouteType()) && StringUtils.isNotEmpty(userDigitalArtworkVo.getTradingAt())) {
+                    listVo.setTransferAllowTime(DateUtil.Formatter.yyyyMMddHHmmss.parse(userDigitalArtworkVo.getTradingAt()).plusSeconds(transferTimeLimit));
+                }
+
                 list.add(listVo);
             }