~api:我的藏品详情+转赠允许时间;

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

@@ -56,14 +56,18 @@ public class GoblinUserDigitalArtworkInfoVo implements Serializable, Cloneable {
     private String skuId;
     @ApiModelProperty(position = 27, value = "展示预览图片URL[256]")
     private String skuWatchPic;
+    @ApiModelProperty(position = 27, value = "区块链路由[zxinchain-至信链|xuper-百度超级链]")
+    private String routeType;
 
     @ApiModelProperty(position = 28, value = "转赠状态[PENDING|SUCCESS]")
     private String transferState;
-    @ApiModelProperty(position = 29, value = "转赠时间限制（单位秒）")
-    private Long transferTimeLimit;
+    @ApiModelProperty(position = 25, value = "转赠允许时间")
+    @JsonFormat(shape=JsonFormat.Shape.STRING, pattern= DateUtil.DATE_FULL_STR)
+    private LocalDateTime transferAllowTime;
     @ApiModelProperty(position = 30, value = "系统当前时间")
     @JsonFormat(shape=JsonFormat.Shape.STRING, pattern= DateUtil.DATE_FULL_STR)
     private LocalDateTime systime;
+
     @ApiModelProperty(position = 31, value = "受赠人信息")
     private String receiverUser;
     @ApiModelProperty(position = 32, value = "藏品转赠时间[yyyy-MM-dd HH:mm:ss]")

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

@@ -50,6 +50,7 @@ public class GoblinUserDigitalArtworkListVo implements Serializable, Cloneable {
     @ApiModelProperty(position = 24, value = "转赠状态[PENDING|SUCCESS]")
     private String transferState;
     @ApiModelProperty(position = 25, value = "转赠允许时间")
+    @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = DateUtil.DATE_FULL_STR)
     private LocalDateTime transferAllowTime;
 
 

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

@@ -163,9 +163,10 @@ public class GoblinUserDigitalArtworkServiceImpl implements IGoblinUserDigitalAr
             artworkInfoVo.setSubtitle(goodsSkuInfoVo.getSubtitle());
             artworkInfoVo.setEdition(goodsSkuInfoVo.getSkuStock());
             artworkInfoVo.setSkuWatchPic(goodsSkuInfoVo.getSkuWatchPic());
+            artworkInfoVo.setRouteType(goodsSkuInfoVo.getRouteType());
 
             boolean notTransferFlg = StringUtils.isEmpty(userDigitalArtworkVo.getTransferState());
-            if (!notTransferFlg) {
+            if (!notTransferFlg) {// 发生转赠
                 artworkInfoVo.setTransferTime(userDigitalArtworkVo.getUpdatedAt());
             }
             if ("0".equals(goodsSkuInfoVo.getUnbox()) && 1 == userDigitalArtworkVo.getState() && notTransferFlg) {// 非盲盒 & 已上链 & 非转赠（转赠中、已转赠）
@@ -174,7 +175,10 @@ public class GoblinUserDigitalArtworkServiceImpl implements IGoblinUserDigitalAr
                 artworkInfoVo.setDetails(goodsSkuInfoVo.getDetails());
                 artworkInfoVo.setArUrlIos(goodsSkuInfoVo.getArUrlIos());
                 artworkInfoVo.setArUrlAndroid(goodsSkuInfoVo.getArUrlAndroid());
-                artworkInfoVo.setTransferTimeLimit(Long.valueOf(goblinRedisUtils.getUserDigitalArtworkTransferConf().get(0)));
+                List<String> transferConfList = goblinRedisUtils.getUserDigitalArtworkTransferConf();
+                if (transferConfList.contains(artworkInfoVo.getRouteType()) && StringUtils.isNotEmpty(userDigitalArtworkVo.getTradingAt())) {
+                    artworkInfoVo.setTransferAllowTime(DateUtil.Formatter.yyyyMMddHHmmss.parse(userDigitalArtworkVo.getTradingAt()).plusSeconds(Long.parseLong(transferConfList.get(0))));
+                }
                 artworkInfoVo.setSystime(LocalDateTime.now());
             }
             return artworkInfoVo;