发票申请参数校验修改

gic-platform-finance-api/src/main/java/com/gic/finance/dto/InvoiceManageDTO.java

 package com.gic.finance.dto;
 
-import javax.validation.constraints.NotBlank;
-import javax.validation.constraints.NotNull;
 import java.io.Serializable;
 import java.util.Date;
 
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
+import javax.validation.constraints.Pattern;
+import javax.validation.constraints.Size;
+
 /**
  * 发票管理
  * @ClassName: InvoiceManageDTO

@@ -12,7 +15,7 @@ import java.util.Date;
  * @author guojuxing

  * @date 2019/8/14 2:40 PM

  */
-public class InvoiceManageDTO implements Serializable{
+public class InvoiceManageDTO implements Serializable {
     private static final long serialVersionUID = -4433646384541039471L;
 
     public interface ApplyInvoiceValid {
@@ -32,19 +35,23 @@ public class InvoiceManageDTO implements Serializable{
     /**
      * （商户类型）1:GIC 2: 好办
      */
-    @NotNull(message = "商户类型不能为空", groups = ApplyInvoiceValid.class)
+    @NotNull(message = "商户类型不能为空", groups = { ApplyInvoiceValid.class })
+    @Size(message = "商户类型值不规范", min = 1, max = 2)
     private Integer platformType;
 
     /**
      * （发票类型）1:纸质普通发票 2: 纸质增值税专用发票
      */
-    @NotNull(message = "发票类型不能为空", groups = ApplyInvoiceValid.class)
+    @NotNull(message = "发票类型不能为空", groups = { ApplyInvoiceValid.class })
+    @Size(message = "发票类型值不规范", min = 1, max = 2)
     private Integer invoiceType;
 
     /**
      * 开票金额
      */
     @NotNull(message = "开票金额不能为空", groups = ApplyInvoiceValid.class)
+    @Pattern(message = "金额数据有误（小数点最多2位），请确认", regexp = "^(([1-9]{1}\\d*)|([0]{1}))(\\.(\\d){0,2})?$", groups = {
+            ApplyInvoiceValid.class })
     private Double billingAmount;
 
     /**
@@ -85,25 +92,25 @@ public class InvoiceManageDTO implements Serializable{
     /**
      *
      */
-    @NotNull(message = "商户ID不能为空", groups = ApplyInvoiceValid.class)
+    @NotNull(message = "商户ID不能为空", groups = { ApplyInvoiceValid.class })
     private Integer enterpriseId;
 
     /**
      * 商户名称
      */
-    @NotBlank(message = "商户名称不能为空", groups = ApplyInvoiceValid.class)
+    @NotBlank(message = "商户名称不能为空", groups = { ApplyInvoiceValid.class })
     private String enterpriseName;
 
     /**
      * 公司名称
      */
-    @NotBlank(message = "公司名称不能为空", groups = ApplyInvoiceValid.class)
+    @NotBlank(message = "公司名称不能为空", groups = { ApplyInvoiceValid.class })
     private String companyName;
 
     /**
      * 公司logo
      */
-    @NotBlank(message = "公司logo不能为空", groups = ApplyInvoiceValid.class)
+    @NotBlank(message = "公司logo不能为空", groups = { ApplyInvoiceValid.class })
     private String logo;
 
     /**
@@ -114,7 +121,7 @@ public class InvoiceManageDTO implements Serializable{
     /**
      * 纳税识别号
      */
-    @NotBlank(message = "纳税识别号不能为空", groups = ApplyInvoiceValid.class)
+    @NotBlank(message = "纳税识别号不能为空", groups = { ApplyInvoiceValid.class })
     private String taxNumber;
 
     /**
@@ -140,19 +147,19 @@ public class InvoiceManageDTO implements Serializable{
     /**
      * 收货人
      */
-    @NotBlank(message = "收货人不能为空", groups = ApplyInvoiceValid.class)
+    @NotBlank(message = "收货人不能为空", groups = { ApplyInvoiceValid.class })
     private String shippingName;
 
     /**
      * 收货电话
      */
-    @NotBlank(message = "收货电话不能为空", groups = ApplyInvoiceValid.class)
+    @NotBlank(message = "收货电话不能为空", groups = { ApplyInvoiceValid.class })
     private String shippingPhone;
 
     /**
      * 收货地址
      */
-    @NotBlank(message = "收货地址不能为空", groups = ApplyInvoiceValid.class)
+    @NotBlank(message = "收货地址不能为空", groups = { ApplyInvoiceValid.class })
     private String shippingAddress;
 
     /**