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

@@ -29,11 +29,20 @@ public class GoblinStoreMgtGoodsSkuListVo implements Serializable, Cloneable {
     @ApiModelProperty(position = 22, value = "商品上架状态[0-待上架|1-下架|2-违规|3-上架]")
     private String shelvesStatus;
     @ApiModelProperty(position = 23, value = "总库存")
-    private Integer totalStock;
+    private Integer skuStock;
     @ApiModelProperty(position = 24, value = "剩余库存")
     private Integer surplusStock;
     @ApiModelProperty(position = 27, value = "开售时间")
-    private String saleStartTime;
+    private LocalDateTime saleStartTime;
     @ApiModelProperty(position = 27, value = "停售时间")
-    private String saleStopTime;
+    private LocalDateTime saleStopTime;
+
+
+    public String getSaleStartTime() {
+        return DateUtil.Formatter.yyyyMMddHHmmss.format(saleStartTime);
+    }
+
+    public String getSaleStopTime() {
+        return DateUtil.Formatter.yyyyMMddHHmmss.format(saleStopTime);
+    }
 }

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

@@ -1465,7 +1465,7 @@ public class GoblinMongoUtils {
     }
 
     public PagedResult<GoblinStoreMgtGoodsSkuListVo> getSkuSearch(GoblinStoreMgtGoodsSkuFilterParam filterParam) {
-        Criteria criteria = Criteria.where("storeId").is(filterParam.getStoreId()).and("SpuId").is(filterParam.getSpuId()).and("delFlg").is("0");
+        Criteria criteria = Criteria.where("storeId").is(filterParam.getStoreId()).and("spuId").is(filterParam.getSpuId()).and("delFlg").is("0");
         if (StringUtils.isNotBlank(filterParam.getKeyword())) {
             Pattern pattern = Pattern.compile("^.*" + filterParam.getKeyword() + ".*$", Pattern.CASE_INSENSITIVE);
             criteria.and("name").regex(pattern);