~api:藏品订单详情+藏品盲盒属性;

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

@@ -16,13 +16,15 @@ public class GoblinNftOrderArtworkInfoVo implements Serializable, Cloneable {
     private static final long serialVersionUID = 5307265664272864863L;
     @ApiModelProperty(position = 10, value = "商品单品ID")
     private String artworkId;
-    @ApiModelProperty(position = 11, value = "藏品状态，区分盲盒来判断[0-生成中/未开启|1-已生成/已开启|2-生成失败/开启失败|5-待收取]")
+    @ApiModelProperty(position = 11, value = "是否盲盒[0-否|1-是]")
+    private String unbox;
+    @ApiModelProperty(position = 12, value = "藏品状态，根据`unbox`区分盲盒来判断[0-生成中/未开启|1-已生成/已开启|2-生成失败/开启失败|5-待收取]")
     private Integer state;
-    @ApiModelProperty(position = 12, value = "转赠状态[PENDING|SUCCESS]，为空代表未发生转赠")
+    @ApiModelProperty(position = 13, value = "转赠状态[PENDING|SUCCESS]，为空代表未发生转赠")
     private String transferState;
-    @ApiModelProperty(position = 13, value = "受赠人信息")
+    @ApiModelProperty(position = 14, value = "受赠人信息")
     private String receiverUser;
-    @ApiModelProperty(position = 14, value = "藏品转赠时间[yyyy-MM-dd HH:mm:ss]")
+    @ApiModelProperty(position = 15, value = "藏品转赠时间[yyyy-MM-dd HH:mm:ss]")
     @JsonFormat(shape=JsonFormat.Shape.STRING, pattern= DateUtil.DATE_FULL_STR)
     private LocalDateTime transferTime;
 

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

@@ -35,9 +35,6 @@ public class GoblinNftOrderDetailsVo implements Serializable, Cloneable {
     @ApiModelProperty(value = "款式id")
     private String skuId;
 
-    @ApiModelProperty(value = "盲盒抽取的款式id 空为明盒 有值为盲盒")
-    private String boxSkuId;
-
     @ApiModelProperty(value = "数量")
     private Integer num;
 
@@ -99,7 +96,6 @@ public class GoblinNftOrderDetailsVo implements Serializable, Cloneable {
         this.setCreatedAt(source.getCreatedAt());
         this.setMixId(source.getMixId());
         this.setMixName(source.getMixName());
-        this.setBoxSkuId(source.getBoxSkuId());
         return this;
     }
 

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

@@ -81,7 +81,14 @@ public class GoblinNftOrderAppServiceImpl implements IGoblinNftOrderAppService {
         GoblinNftOrderGoodsSkuInfoVo nftGoodsSkuInfoVo = GoblinNftOrderGoodsSkuInfoVo.getNew().copy(goodsSkuInfoVo);
         orderDetails.setGoodsSkuInfoVo(nftGoodsSkuInfoVo);
         if (StringUtils.isNotEmpty(orderVo.getArtworkId())) {
-            orderDetails.setArtworkInfoVo(GoblinNftOrderArtworkInfoVo.getNew().copy(goblinRedisUtils.getUserDigitalArtworkVo(orderVo.getArtworkId())));
+            GoblinUserDigitalArtworkVo userDigitalArtworkVo = goblinRedisUtils.getUserDigitalArtworkVo(orderVo.getArtworkId());
+            GoblinNftOrderArtworkInfoVo nftOrderArtworkInfoVo = GoblinNftOrderArtworkInfoVo.getNew().copy(userDigitalArtworkVo);
+            if (userDigitalArtworkVo.getSkuId().equals(orderVo.getSkuId())) {
+                nftOrderArtworkInfoVo.setUnbox(goodsSkuInfoVo.getUnbox());
+            } else {
+                nftOrderArtworkInfoVo.setUnbox(goblinRedisUtils.getGoodsSkuInfoVo(userDigitalArtworkVo.getSkuId()).getUnbox());
+            }
+            orderDetails.setArtworkInfoVo(nftOrderArtworkInfoVo);
         }
 
         return ResponseDto.success(orderDetails);