exit

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

@@ -14,7 +14,6 @@ import java.time.LocalDateTime;
 import java.util.List;
 
 /**
- *
  * @author liquidnet
  * @since 2022-04-07
  */
@@ -36,12 +35,12 @@ public class GoblinGoodsAnticipateAddParam {
     @NotBlank(message = "预约规则")
     private String rule;
 
-    @ApiModelProperty(value = "预约类型（1：预约提醒，2：预约获得购买资格）")
+    @ApiModelProperty(required = true, value = "预约类型（1：预约提醒，2：预约获得购买资格）")
     @NotBlank(message = "预约类型")
     private int type;
 
     @ApiModelProperty(value = "预约人数（达到一定人数可以预约）")
-    @NotBlank(message="预约人数")
+    @NotBlank(message = "预约人数")
     private Integer people;
 
     @ApiModelProperty("sku信息")

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

@@ -22,7 +22,7 @@ import java.time.LocalDateTime;
  */
 @ApiModel(value = "GoblinGoodsAnticipateValueParam", description = "获取预约")
 @Data
-public class GoblinGoodsAnticipateValueParam{
+public class GoblinGoodsAnticipateValueParam {
 
     @ApiModelProperty(position = 11, required = true, value = "当前记录起始索引", example = "1")
     @Min(value = 1, message = "起始索引无效")
@@ -54,7 +54,8 @@ public class GoblinGoodsAnticipateValueParam{
     @ApiModelProperty(position = 18, required = false, value = "创建日期")
     private String createdDate;
 
-    @ApiModelProperty(required = false, value = "预约类型（1：预约提醒，2：预约获得购买资格）")
+    @ApiModelProperty(required = true, value = "预约类型（1：预约提醒，2：预约获得购买资格）")
+    @NotNull(message = "预约类型")
     private Integer type;
 
 

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

@@ -60,10 +60,7 @@ public class GoblinMongoUtils {
     public HashMap<String, Object> getGoblinGoodsAnticipateValueVos(GoblinGoodsAnticipateValueParam goblinGoodsAnticipateValueParam, String uid) {
         HashMap<String, Object> info = CollectionUtil.mapStringObject();
         Pageable pageable = PageRequest.of(goblinGoodsAnticipateValueParam.getPageNum() - 1, 20, Sort.by(Sort.Direction.DESC, "createdDate"));
-        Criteria criteria = Criteria.where("delTag").is(0).and("uid").is(uid);
-        if (goblinGoodsAnticipateValueParam.getType()!=null){
-            criteria = criteria.and("type").is(goblinGoodsAnticipateValueParam.getType());
-        }
+        Criteria criteria = Criteria.where("delTag").is(0).and("uid").is(uid).and("type").is(goblinGoodsAnticipateValueParam.getType());
         if (StringUtils.isNotBlank(goblinGoodsAnticipateValueParam.getName())) {
             criteria = criteria.and("skuName").regex(".*?" + goblinGoodsAnticipateValueParam.getName() + ".*");
         }