~api:藏品详情调整;

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

@@ -64,6 +64,11 @@ public class GoblinUserDigitalArtworkInfoVo implements Serializable, Cloneable {
     @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]")
+    @JsonFormat(shape=JsonFormat.Shape.STRING, pattern= DateUtil.DATE_FULL_STR)
+    private LocalDateTime transferTime;
 
     private static final GoblinUserDigitalArtworkInfoVo obj = new GoblinUserDigitalArtworkInfoVo();
 
@@ -92,6 +97,8 @@ public class GoblinUserDigitalArtworkInfoVo implements Serializable, Cloneable {
         this.setPublisher(source.getPublisher());
 //        this.setDetails();
         this.setSkuId(source.getSkuId());
+        this.setTransferState(source.getTransferState());
+        this.setReceiverUser(source.getReceiverUser());
         return this;
     }
 }

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

@@ -34,8 +34,8 @@ public class GoblinUserDigitalArtworkVo implements Serializable, Cloneable {
     /* ---------------------- 冗余的关联信息 ---------------------- */
     private String author;
     private String publisher;
-    private String transferUser;
     private String hitArtworkId;
+    private String receiverUser;
 
     private static final GoblinUserDigitalArtworkVo obj = new GoblinUserDigitalArtworkVo();
 

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

@@ -155,12 +155,16 @@ public class GoblinUserDigitalArtworkServiceImpl implements IGoblinUserDigitalAr
             artworkInfoVo.setCoverPic(goodsSkuInfoVo.getSkuPic());
             artworkInfoVo.setName(goodsSkuInfoVo.getName());
             artworkInfoVo.setSubtitle(goodsSkuInfoVo.getSubtitle());
+            artworkInfoVo.setEdition(goodsSkuInfoVo.getSkuStock());
 //            artworkInfoVo.setAuthor(goodsInfoVo.getAuthor());
 
-            if ("0".equals(goodsSkuInfoVo.getUnbox()) && 1 == userDigitalArtworkVo.getState() && StringUtils.isEmpty(userDigitalArtworkVo.getTransferState())) {// 非盲盒 & 已上链 & 非转赠（转赠中、已转赠）
+            boolean notTransferFlg = StringUtils.isEmpty(userDigitalArtworkVo.getTransferState());
+            if (!notTransferFlg) {
+                artworkInfoVo.setTransferTime(userDigitalArtworkVo.getUpdatedAt());
+            }
+            if ("0".equals(goodsSkuInfoVo.getUnbox()) && 1 == userDigitalArtworkVo.getState() && notTransferFlg) {// 非盲盒 & 已上链 & 非转赠（转赠中、已转赠）
                 artworkInfoVo.setMaterialType(goodsSkuInfoVo.getMaterialType());
                 artworkInfoVo.setMaterialUrl(goodsSkuInfoVo.getMaterialUrl());
-                artworkInfoVo.setEdition(goodsSkuInfoVo.getSkuStock());
 //                artworkInfoVo.setPublisher(goodsInfoVo.getPublisher());
                 artworkInfoVo.setDetails(goodsSkuInfoVo.getDetails());
                 artworkInfoVo.setArUrlIos(goodsSkuInfoVo.getArUrlIos());
@@ -316,7 +320,7 @@ public class GoblinUserDigitalArtworkServiceImpl implements IGoblinUserDigitalAr
         userDigitalArtworkVo.setReceiverUid(receiverArr[0]);
         userDigitalArtworkVo.setTransferOrderId(IDGenerator.nextSnowId());
         userDigitalArtworkVo.setTransferState(GoblinStatusConst.TransferState.PENDING.name());
-        userDigitalArtworkVo.setTransferUser(SensitizeUtil.custom(receiverArr[1], 0, 1) + String.format("(%s)", SensitizeUtil.custom(receiverArr[2], 3, 4)));
+        userDigitalArtworkVo.setReceiverUser(SensitizeUtil.custom(receiverArr[1], 0, 1) + String.format("(%s)", SensitizeUtil.custom(receiverArr[2], 3, 4)));
         if (goblinRedisUtils.setUserDigitalArtworkVo(userDigitalArtworkVo)) {
             LocalDateTime nowTime = LocalDateTime.now();