修改 参数验证 config-dev的rabbitmq

liquidnet-bus-api/liquidnet-service-kylin-api/src/main/java/com/liquidnet/service/kylin/dto/param/PayAgainParam.java

@@ -8,13 +8,13 @@ import javax.validation.constraints.NotNull;
 @Data
 public class PayAgainParam {
     @ApiModelProperty(value = "订单id")
-    @NotNull(message = "必传")
+    @NotNull(message = "订单id不能为空")
     private String orderId;
     @ApiModelProperty(value = "支付类型")
-    @NotNull(message = "必传")
+    @NotNull(message = "支付类型不能为空")
     private String payType;
     @ApiModelProperty(value = "支付来源")
-    @NotNull(message = "必传")
+    @NotNull(message = "支付来源不能为空")
     private String deviceFrom;
     @ApiModelProperty(value = "openId")
     private String openId;

liquidnet-bus-api/liquidnet-service-kylin-api/src/main/java/com/liquidnet/service/kylin/dto/param/PayOrderParam.java

@@ -14,17 +14,18 @@ import java.util.List;
 @Data
 public class PayOrderParam {
     @ApiModelProperty(value = "演出id")
-    @NotNull(message = "必传")
+    @NotNull(message = "演出id不能为空")
     private String performanceId;
     @ApiModelProperty(value = "场次id")
-    @NotNull(message = "必传")
+    @NotNull(message = "场次id不能为空")
     private String timeId;
     @ApiModelProperty(value = "票种id")
+    @NotNull(message = "票种id不能为空")
     @NotNull(message = "必传")
     private String ticketId;
     @ApiModelProperty(value = "数量")
-    @NotNull(message = "必传")
-    @Min(value = 1,message = "太小了")
+    @NotNull(message = "数量不能为空")
+    @Min(value = 1,message = "不能小于0")
     private Integer number;
 
 //    @ApiModelProperty(value = "是否学生票")
@@ -40,18 +41,20 @@ public class PayOrderParam {
     @ApiModelProperty(value = "入场人id数组")
     private List<String> enterIdList;
     @ApiModelProperty(value = "代理id")
-    @NotNull(message = "必传")
+    @NotNull(message = "代理id不能为空")
     private String agentId;
     @ApiModelProperty(value = "快递类型 1寄付 2到付")
-    @NotNull(message = "必传")
+    @NotNull(message = "快递方式不能为空")
+    @Max(2)
+    @Max(1)
     private Integer expressType;
 
 
     @ApiModelProperty(value = "支付类型")
-    @NotNull(message = "必传")
+    @NotNull(message = "支付类型不能为空")
     private String payType;
     @ApiModelProperty(value = "支付来源")
-    @NotNull(message = "必传")
+    @NotNull(message = "支付来源")
     private String deviceFrom;
     @ApiModelProperty(value = "openId")
     private String openId;

liquidnet-bus-service/liquidnet-service-kylin/liquidnet-service-kylin-impl/src/main/java/com/liquidnet/service/kylin/controller/KylinOrderTicketsController.java

@@ -79,7 +79,7 @@ public class KylinOrderTicketsController {
     @GetMapping("checkPayment")
     @ApiOperation("订单状态")
     @ApiResponse(code = 200, message = "接口返回对象参数")
-    public ResponseDto<HashMap> checkOrderResult(@RequestParam("orderId") @NotNull String orderId) {
+    public ResponseDto<HashMap> checkOrderResult(@RequestParam("orderId") @NotNull(message = "订单id不能为空") String orderId) {
         Integer status = orderTicketsService.checkOrderResult(orderId).getData();
         HashMap<String,Integer> map = new HashMap<>();
         map.put("status",status);

liquidnet-bus-service/liquidnet-service-kylin/liquidnet-service-kylin-impl/src/main/java/com/liquidnet/service/kylin/controller/partner/KylinCheckUserPartnerController.java

@@ -13,6 +13,7 @@ import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiResponse;
 import org.hibernate.validator.constraints.Length;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 
 import javax.validation.constraints.Min;
@@ -29,6 +30,7 @@ import javax.validation.constraints.NotNull;
 @Api(tags = "第三方-验票账号")
 @RestController
 @RequestMapping("partner/checkUser")
+@Validated
 public class KylinCheckUserPartnerController {
 
     @Autowired

liquidnet-bus-service/liquidnet-service-kylin/liquidnet-service-kylin-impl/src/main/java/com/liquidnet/service/kylin/controller/partner/KylinCheckUserPerformancesPartnerController.java

@@ -13,6 +13,7 @@ import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiResponse;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 
 import javax.validation.Valid;
@@ -33,6 +34,7 @@ import java.util.List;
 @Api(tags = "第三方-验票账号关联演出")
 @RestController
 @RequestMapping("partner/checkUser/performance")
+@Validated
 public class KylinCheckUserPerformancesPartnerController {
 
     @Autowired

liquidnet-bus-service/liquidnet-service-kylin/liquidnet-service-kylin-impl/src/main/java/com/liquidnet/service/kylin/controller/partner/KylinTicketTimesPartnerController.java

@@ -9,6 +9,7 @@ import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiResponse;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 
 import javax.validation.Valid;
@@ -25,6 +26,7 @@ import javax.validation.constraints.NotNull;
 @Api(tags = "第三方-场次",position = 1002)
 @RestController
 @RequestMapping("partner/times")
+@Validated
 public class KylinTicketTimesPartnerController {
 
     @Autowired

liquidnet-bus-service/liquidnet-service-kylin/liquidnet-service-kylin-impl/src/main/java/com/liquidnet/service/kylin/controller/partner/KylinTicketsPartnerController.java

@@ -9,6 +9,7 @@ import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiResponse;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 
 import javax.validation.Valid;
@@ -25,6 +26,7 @@ import javax.validation.constraints.NotNull;
 @Api(tags = "第三方-票",position = 1003)
 @RestController
 @RequestMapping("partner/ticket")
+@Validated
 public class KylinTicketsPartnerController {
 
     @Autowired

liquidnet-bus-service/liquidnet-service-kylin/liquidnet-service-kylin-impl/src/main/java/com/liquidnet/service/kylin/controller/partner/PerformancePartnerController.java

@@ -9,6 +9,7 @@ import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiResponse;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 
 import javax.validation.Valid;
@@ -19,6 +20,7 @@ import java.util.Map;
 @Api(tags = "第三方-演出",position = 1001)
 @RestController
 @RequestMapping("partner/performance")
+@Validated
 public class PerformancePartnerController {
 
     @Autowired