修改新预约，根据spuId和店铺id查询返回sku列表新增状态4返回已上架未开售的sku

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

@@ -23,7 +23,7 @@ public class GoblinStoreMgtGoodsSkuFilterParam implements Serializable {
     private Integer pageNum;
     @ApiModelProperty(position = 13, required = false, value = "搜索关键字[128]")
     private String keyword;
-    @ApiModelProperty(position = 14, required = false, value = "商品上架状态[0-待上架|1-下架|2-违规|3-上架]", allowableValues = "0,1,2,3")
+    @ApiModelProperty(position = 14, required = false, value = "商品上架状态[0-待上架|1-下架|2-违规|3-上架|4-已上架未开售]", allowableValues = "0,1,2,3")
     private String shelvesStatus;
 
 }

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

@@ -42,6 +42,7 @@ import java.util.regex.Pattern;
 import java.util.stream.Collectors;
 
 import static com.liquidnet.commons.lang.util.DateUtil.DTF_YMD_HMS;
+import static com.liquidnet.commons.lang.util.DateUtil.now;
 
 @Component
 public class GoblinMongoUtils {
@@ -1552,8 +1553,12 @@ public class GoblinMongoUtils {
             criteria.and("name").regex(pattern);
         }
         if (StringUtils.isNotBlank(filterParam.getShelvesStatus())) {
+            if ("4".equals(filterParam.getShelvesStatus())){
+                criteria.and("shelvesStatus").is("3").and("saleStartTime").gte(now());
+            }else {
                 criteria.and("shelvesStatus").is(filterParam.getShelvesStatus());
             }
+        }
         Query query = Query.query(criteria);
 
         long count = mongoTemplate.count(query, GoblinGoodsSkuInfoVo.class.getSimpleName());