发票管理

gly-base-core/src/main/java/cn/com/taiji/core/model/comm/protocol/ias/IasServiceCmd.java

@@ -11,6 +11,8 @@ public enum IasServiceCmd implements SignServiceCommand {
     BILLRAISEUPDATE("发票抬头修改","billRaiseUpdate", BillRaiseUpdateRequest.class),
     BILLRECORD("发票开票记录","billRecord", BillRecordRequest.class),
     BILLREVERSAL("发票红冲","billReversal", BillReversalRequest.class),
+    BILLMERGEINVOICING("ETC产品合并开票","billMergeInvoicing", BillMergeInvoicingRequest.class),
+    BILLORDERPUSH("发票订单补推","billOrderPush", BillOrderPushLogRequest.class),
 
     ;
 

gly-base-core/src/main/java/cn/com/taiji/core/model/comm/protocol/ias/bill/BillMergeInvoicingRequest.java

@@ -0,0 +1,49 @@
+package cn.com.taiji.core.model.comm.protocol.ias.bill;
+
+import cn.com.taiji.core.model.comm.protocol.ias.AbstractIasRequest;
+import cn.com.taiji.core.model.comm.protocol.ias.IasServiceCmd;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import lombok.Getter;
+import lombok.Setter;
+
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotEmpty;
+import java.util.List;
+
+@Getter
+@Setter
+public class BillMergeInvoicingRequest extends AbstractIasRequest<BillMergeInvoicingResponse> {
+    protected BillMergeInvoicingRequest() {
+        super(IasServiceCmd.BILLMERGEINVOICING);
+    }
+    /**
+     * ETC产品订单号
+     */
+    @JsonProperty(value = "Orders")
+    @NotEmpty(message = "ETC产品订单号不能为空")
+    private List<String> orders;
+    /**
+     * 发票抬头编号
+     */
+    @JsonProperty(value = "TitleId")
+    @NotBlank(message = "发票抬头编号不能为空")
+    private String titleId;
+    /**
+     * 身份证后6位
+     */
+    @JsonProperty(value = "SubIdentNo")
+    @NotBlank(message = "身份证后6位不能为空")
+    private String subIdentNo;
+    /**
+     * 手机号
+     */
+    @JsonProperty(value = "UserMobile")
+    @NotBlank(message = "手机号不能为空")
+    private String userMobile;
+    /**
+     * 售方信息编号
+     */
+    @JsonProperty(value = "SellerId")
+    @NotBlank(message = "售方信息编号不能为空")
+    private String sellerId;
+}

gly-base-core/src/main/java/cn/com/taiji/core/model/comm/protocol/ias/bill/BillMergeInvoicingResponse.java

@@ -0,0 +1,6 @@
+package cn.com.taiji.core.model.comm.protocol.ias.bill;
+
+import cn.com.taiji.core.model.comm.protocol.ias.AbstractIasResponse;
+
+public class BillMergeInvoicingResponse extends AbstractIasResponse {
+}

gly-base-core/src/main/java/cn/com/taiji/core/model/comm/protocol/ias/bill/BillOrderPushLogRequest.java

@@ -0,0 +1,76 @@
+package cn.com.taiji.core.model.comm.protocol.ias.bill;
+
+import cn.com.taiji.core.model.comm.protocol.ias.AbstractIasRequest;
+import cn.com.taiji.core.model.comm.protocol.ias.IasServiceCmd;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import lombok.Getter;
+import lombok.Setter;
+
+import javax.validation.constraints.NotBlank;
+
+@Getter
+@Setter
+public class BillOrderPushLogRequest extends AbstractIasRequest<BillOrderPushLogResponse> {
+    protected BillOrderPushLogRequest() {
+        super(IasServiceCmd.BILLORDERPUSH);
+    }
+    /** 推送ID*/
+    @JsonProperty(value = "Id")
+    @NotBlank(message = "推送ID不能为空")
+    private String id;
+    /** 订单号*/
+    @JsonProperty(value = "OrderNo")
+    @NotBlank(message = "订单号不能为空")
+    private String orderNo;
+    /** 车牌号*/
+    @JsonProperty(value = "VehiclePlate")
+    @NotBlank(message = "车牌号不能为空")
+    private String vehiclePlate;
+    /** 车牌颜色*/
+    @JsonProperty(value = "VehiclePlateColor")
+    @NotBlank(message = "车牌颜色不能为空")
+    private Integer vehiclePlateColor;
+    /** 激活时间不能为空*/
+    @JsonProperty(value = "ActiveTime")
+    @NotBlank(message = "激活时间不能为空")
+    private String activeTime;
+    /** 身份证后6位*/
+    @JsonProperty(value = "IdentNo")
+    @NotBlank(message = "身份证后6位不能为空")
+    private String identNo;
+    /** 订单类型*/
+    @JsonProperty(value = "Type")
+    @NotBlank(message = "收费车型不能为空")
+    private Integer type;
+    /** 手机号*/
+    @JsonProperty(value = "UserMobile")
+    @NotBlank(message = "手机号不能为空")
+    private String userMobile;
+    /** 创建时间*/
+    @JsonProperty(value = "CreateTime")
+    @NotBlank(message = "创建时间不能为空")
+    private String createTime;
+    /** 产品型号*/
+    @JsonProperty(value = "ProductModel")
+    @NotBlank(message = "产品编码不能为空")
+    private String productModel;
+    /** 产品类型*/
+    @JsonProperty(value = "ProductType")
+    @NotBlank(message = "产品类型不能为空")
+    private String productType;
+    /** 订单类型*/
+    @JsonProperty(value = "OrderType")
+    @NotBlank(message = "订单类型不能为空")
+    private Integer orderType;
+    /** 发票金额*/
+    @JsonProperty(value = "InvoiceAmount")
+    @NotBlank(message = "发票金额不能为空")
+    private Integer invoiceAmount;
+
+    @JsonProperty(value = "UserId")
+    private String userId;
+    @JsonProperty(value = "UserName")
+    private String userName;
+    @JsonProperty(value = "LoginSource")
+    private String loginSource;
+}

gly-base-core/src/main/java/cn/com/taiji/core/model/comm/protocol/ias/bill/BillOrderPushLogResponse.java

@@ -0,0 +1,6 @@
+package cn.com.taiji.core.model.comm.protocol.ias.bill;
+
+import cn.com.taiji.core.model.comm.protocol.ias.AbstractIasResponse;
+
+public class BillOrderPushLogResponse extends AbstractIasResponse {
+}

gly-base-core/src/main/java/cn/com/taiji/core/model/comm/protocol/ias/bill/BillRaiseDeleteRequest.java

@@ -6,6 +6,7 @@ import com.fasterxml.jackson.annotation.JsonProperty;
 import lombok.Getter;
 import lombok.Setter;
 
+import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.NotNull;
 
 @Getter
@@ -17,11 +18,11 @@ public class BillRaiseDeleteRequest extends AbstractIasRequest<BillRaiseDeleteRe
 
     /** 抬头记录id*/
     @JsonProperty(value = "Id")
-    @NotNull(message = "抬头记录id不能为空")
+    @NotBlank(message = "抬头记录id不能为空")
     private String id;
     /** 客户手机号*/
     @JsonProperty(value = "UserMobile")
-    @NotNull(message = "手机号不能为空")
+    @NotBlank(message = "手机号不能为空")
     private String userMobile;
 
     @JsonProperty(value = "OpenId")

gly-base-core/src/main/java/cn/com/taiji/core/model/comm/protocol/ias/bill/BillRaiseInsertRequest.java

@@ -6,7 +6,7 @@ import com.fasterxml.jackson.annotation.JsonProperty;
 import lombok.Getter;
 import lombok.Setter;
 
-import javax.validation.constraints.NotNull;
+import javax.validation.constraints.NotBlank;
 
 @Getter
 @Setter
@@ -19,25 +19,25 @@ public class BillRaiseInsertRequest extends AbstractIasRequest<BillRaiseInsertRe
      * 抬头类型 1：单位抬头；2：个人抬头
      */
     @JsonProperty(value = "TitleType")
-    @NotNull(message = "抬头类型不能为空")
+    @NotBlank(message = "抬头类型不能为空")
     private Integer titleType;
     /**
      * 客户手机号
      */
     @JsonProperty(value = "UserMobile")
-    @NotNull(message = "手机号不能为空")
+    @NotBlank(message = "手机号不能为空")
     private String userMobile;
     /**
      * 是否为默认抬头 1：默认抬头；-1：非默认抬头；
      */
     @JsonProperty(value = "IsDefault")
-    @NotNull(message = "是否为默认抬头不能为空")
+    @NotBlank(message = "是否为默认抬头不能为空")
     private Integer isDefault;
     /**
      * 抬头名称
      */
     @JsonProperty(value = "BuyerName")
-    @NotNull(message = "抬头名称不能为空")
+    @NotBlank(message = "抬头名称不能为空")
     private String buyerName;
     /**
      * 纳税人识别号 抬头类型为单位时必填

gly-base-core/src/main/java/cn/com/taiji/core/model/comm/protocol/ias/bill/BillRaiseUpdateRequest.java

@@ -6,7 +6,7 @@ import com.fasterxml.jackson.annotation.JsonProperty;
 import lombok.Getter;
 import lombok.Setter;
 
-import javax.validation.constraints.NotNull;
+import javax.validation.constraints.NotBlank;
 
 @Getter
 @Setter
@@ -19,25 +19,25 @@ public class BillRaiseUpdateRequest extends AbstractIasRequest<BillRaiseUpdateRe
      * 抬头记录id
      */
     @JsonProperty(value = "Id")
-    @NotNull(message = "抬头记录id不能为空")
+    @NotBlank(message = "抬头记录id不能为空")
     private String id;
     /**
      * 客户手机号
      */
     @JsonProperty(value = "UserMobile")
-    @NotNull(message = "手机号不能为空")
+    @NotBlank(message = "手机号不能为空")
     private String userMobile;
     /**
      * 是否为默认抬头 1：默认抬头；-1：非默认抬头；
      */
     @JsonProperty(value = "IsDefault")
-    @NotNull(message = "是否为默认抬头不能为空")
+    @NotBlank(message = "是否为默认抬头不能为空")
     private Integer isDefault;
     /**
      * 抬头名称
      */
     @JsonProperty(value = "BuyerName")
-    @NotNull(message = "抬头名称不能为空")
+    @NotBlank(message = "抬头名称不能为空")
     private String buyerName;
     /**
      * 纳税人识别号 抬头类型为单位时必填

gly-base-core/src/main/java/cn/com/taiji/core/model/comm/protocol/ias/bill/BillRecordRequest.java

@@ -6,6 +6,7 @@ import com.fasterxml.jackson.annotation.JsonProperty;
 import lombok.Getter;
 import lombok.Setter;
 
+import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.NotNull;
 
 @Getter
@@ -34,7 +35,7 @@ public class BillRecordRequest extends AbstractIasRequest<BillRecordResponse> {
     private Integer pageSize;
     /** 手机号*/
     @JsonProperty(value = "UserMobile")
-    @NotNull(message = "手机号不能为空")
+    @NotBlank(message = "手机号不能为空")
     private String userMobile;
     /** 操作来源*/
     @JsonProperty(value = "OperationSource")

gly-base-core/src/main/java/cn/com/taiji/core/model/comm/protocol/ias/bill/BillReversalRequest.java

@@ -2,9 +2,32 @@ package cn.com.taiji.core.model.comm.protocol.ias.bill;
 
 import cn.com.taiji.core.model.comm.protocol.ias.AbstractIasRequest;
 import cn.com.taiji.core.model.comm.protocol.ias.IasServiceCmd;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import lombok.Getter;
+import lombok.Setter;
 
+import javax.validation.constraints.NotBlank;
+
+@Getter
+@Setter
 public class BillReversalRequest extends AbstractIasRequest<BillReversalResponse> {
     protected BillReversalRequest() {
         super(IasServiceCmd.BILLREVERSAL);
     }
+    /***
+     *开票流水号
+     */
+    @JsonProperty(value = "SerialNo")
+    @NotBlank
+    private String serialNo;
+    /***
+     *开票流水号
+     */
+    @JsonProperty(value = "ReversalReason")
+    @NotBlank
+    private String  reversalReason;
+    @JsonProperty(value = "OpenId")
+    private String openId;
+    @JsonProperty(value = "LoginSource")
+    private String loginSource;
 }