盲盒下单 判断逻辑完成

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

@@ -88,7 +88,7 @@ public class GoblinGoodsSkuInfoVo implements Serializable, Cloneable {
     @ApiModelProperty(position = 27, value = "停售时间")
     private LocalDateTime saleStopTime;
     @ApiModelProperty(position = 28, value = "单品有效期")
-    @JsonFormat(shape=JsonFormat.Shape.STRING, pattern= DateUtil.DATE_FULL_STR)
+    @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = DateUtil.DATE_FULL_STR)
     private LocalDateTime skuValidity;
     @ApiModelProperty(position = 29, value = "是否是虚拟商品[0-否|1-是]")
     private String virtualFlg;
@@ -107,7 +107,7 @@ public class GoblinGoodsSkuInfoVo implements Serializable, Cloneable {
     @ApiModelProperty(position = 33, value = "是否盲盒[0-否|1-是]")
     private String unbox;
     @ApiModelProperty(position = 33, value = "盲盒开启时间")
-    @JsonFormat(shape=JsonFormat.Shape.STRING, pattern= DateUtil.DATE_FULL_STR)
+    @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = DateUtil.DATE_FULL_STR)
     private LocalDateTime openingTime;
     @ApiModelProperty(position = 33, value = "盲盒开启时限[单位秒]")
     private Integer openingLimit;
@@ -130,7 +130,7 @@ public class GoblinGoodsSkuInfoVo implements Serializable, Cloneable {
     @ApiModelProperty(position = 34, value = "删除标记[0-未删除|1-删除]")
     private String delFlg;
     @ApiModelProperty(position = 35, value = "上架时间")
-    @JsonFormat(shape=JsonFormat.Shape.STRING, pattern= DateUtil.DATE_FULL_STR)
+    @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = DateUtil.DATE_FULL_STR)
     private LocalDateTime shelvesAt;
     @ApiModelProperty(position = 36, value = "活动Id")
     private String marketId;
@@ -138,13 +138,13 @@ public class GoblinGoodsSkuInfoVo implements Serializable, Cloneable {
     private String logisticsTemplate;
 
     private String createdBy;
-    @JsonFormat(shape=JsonFormat.Shape.STRING, pattern= DateUtil.DATE_FULL_STR)
+    @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = DateUtil.DATE_FULL_STR)
     private LocalDateTime createdAt;
     private String updatedBy;
-    @JsonFormat(shape=JsonFormat.Shape.STRING, pattern= DateUtil.DATE_FULL_STR)
+    @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = DateUtil.DATE_FULL_STR)
     private LocalDateTime updatedAt;
     private String deletedBy;
-    @JsonFormat(shape=JsonFormat.Shape.STRING, pattern= DateUtil.DATE_FULL_STR)
+    @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = DateUtil.DATE_FULL_STR)
     private LocalDateTime deletedAt;
 
     @ApiModelProperty(position = 40, value = "单品AR文件URL-iOS版")
@@ -164,6 +164,14 @@ public class GoblinGoodsSkuInfoVo implements Serializable, Cloneable {
 
     private static final GoblinGoodsSkuInfoVo obj = new GoblinGoodsSkuInfoVo();
 
+    public String getUnbox() {
+        if (skuType == 0) {
+            return unbox == null ? "0" : unbox;
+        } else {
+            return unbox;
+        }
+    }
+
     public static GoblinGoodsSkuInfoVo getNew() {
         try {
             return (GoblinGoodsSkuInfoVo) obj.clone();