Merge remote-tracking branch 'origin/dev_nft_411' into dev_nft_411

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

 package com.liquidnet.service.goblin.dto.manage.vo;
 
-import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.liquidnet.commons.lang.util.DateUtil;
+import com.liquidnet.service.goblin.dto.vo.GoblinGoodsSkuInfoVo;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import java.io.Serializable;
-import java.math.BigDecimal;
 import java.time.LocalDateTime;
 
 @ApiModel(value = "GoblinStoreMgtGoodsSkuListVo", description = "商品管理:商品款式信息")
@@ -36,6 +35,8 @@ public class GoblinStoreMgtGoodsSkuListVo implements Serializable, Cloneable {
     private LocalDateTime saleStartTime;
     @ApiModelProperty(position = 27, value = "停售时间")
     private LocalDateTime saleStopTime;
+    @ApiModelProperty(position = 33, value = "是否盲盒[0-否|1-是]")
+    private String unbox;
 
 
     public String getSaleStartTime() {
@@ -45,4 +46,30 @@ public class GoblinStoreMgtGoodsSkuListVo implements Serializable, Cloneable {
     public String getSaleStopTime() {
         return DateUtil.Formatter.yyyyMMddHHmmss.format(saleStopTime);
     }
+
+    private static final GoblinStoreMgtGoodsSkuListVo obj = new GoblinStoreMgtGoodsSkuListVo();
+
+    public static GoblinStoreMgtGoodsSkuListVo getNew() {
+        try {
+            return (GoblinStoreMgtGoodsSkuListVo) obj.clone();
+        } catch (CloneNotSupportedException e) {
+            return new GoblinStoreMgtGoodsSkuListVo();
+        }
+    }
+
+    public GoblinStoreMgtGoodsSkuListVo copy(GoblinGoodsSkuInfoVo source) {
+        if (null == source) return this;
+        this.setStoreId(source.getStoreId());
+        this.setSpuId(source.getSpuId());
+        this.setSkuId(source.getSkuId());
+        this.setName(source.getName());
+        this.setStatus(source.getStatus());
+        this.setShelvesStatus(source.getShelvesStatus());
+        this.setSkuStock(source.getSkuStock());
+        this.setSurplusStock(source.getSurplusStock());
+        this.setSaleStartTime(source.getSaleStartTime());
+        this.setSaleStopTime(source.getSaleStopTime());
+        this.setUnbox(source.getUnbox());
+        return this;
+    }
 }

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

@@ -1484,9 +1484,16 @@ public class GoblinMongoUtils {
         query.with(PageRequest.of(filterParam.getPageNum() - 1, 20));
         query.with(Sort.by(Sort.Order.desc("createdAt")));
 
-        List<GoblinStoreMgtGoodsSkuListVo> voList = mongoTemplate.find(query, GoblinStoreMgtGoodsSkuListVo.class, GoblinGoodsSkuInfoVo.class.getSimpleName());
-        for (GoblinStoreMgtGoodsSkuListVo vo : voList) {
-            vo.setSurplusStock(redisUtils.getSkuStock(null, vo.getSkuId()));
+        List<GoblinGoodsSkuInfoVo> skuList = mongoTemplate.find(query, GoblinGoodsSkuInfoVo.class, GoblinGoodsSkuInfoVo.class.getSimpleName());
+        List<GoblinStoreMgtGoodsSkuListVo> voList = ObjectUtil.getGoblinStoreMgtGoodsSkuListVoArrayList();
+        for (GoblinGoodsSkuInfoVo vo : skuList) {
+            GoblinStoreMgtGoodsSkuListVo mgtGoodsSkuListVo = GoblinStoreMgtGoodsSkuListVo.getNew().copy(vo);
+            if (vo.getUnbox().equals("0")) {
+                mgtGoodsSkuListVo.setSurplusStock(redisUtils.getSkuStock(null, vo.getSkuId()));
+            } else {
+                mgtGoodsSkuListVo.setSurplusStock(redisUtils.getSkuAllStatusStock(vo));
+            }
+            voList.add(mgtGoodsSkuListVo);
         }
         return pagedResult.setList(voList).setTotal(count, 20);
     }

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

@@ -83,6 +83,7 @@ public class ObjectUtil {
     private static final ArrayList<TempCouponVo> tempCouponVo = new ArrayList<>();
     private static final ArrayList<GoblinUserDigitalArtworkListVo> GOBLIN_USER_DIGITAL_ARTWORK_LIST_VO_ARRAY_LIST = new ArrayList<>();
     private static final PagedResult<GoblinStoreMgtGoodsSkuListVo> goblinStoreMgtGoodsSkuListVo = new PagedResult<>();
+    private static final ArrayList<GoblinStoreMgtGoodsSkuListVo> goblinStoreMgtGoodsSkuListVoArrayList = new ArrayList<>();
 
     private static final BasicDBObject basicDBObject = new BasicDBObject();
     private static final ArrayList<WriteModel<Document>> writeModelDocumentArrayList = new ArrayList<>();
@@ -99,6 +100,10 @@ public class ObjectUtil {
         return goblinStoreMgtGoodsSkuListVo.clone();
     }
 
+    public static ArrayList<GoblinStoreMgtGoodsSkuListVo> getGoblinStoreMgtGoodsSkuListVoArrayList() {
+        return (ArrayList<GoblinStoreMgtGoodsSkuListVo>) goblinStoreMgtGoodsSkuListVoArrayList.clone();
+    }
+
     public static PagedResult<GoblinStoreMgtCouponListVo> getGoblinStoreMgtCouponListVoPagedResult() {
         return goblinStoreMgtCouponListVoPagedResult.clone();
     }