Merge branch 'master' of http://82.156.35.112:3000/qiubinghui/zhywpt-issuer

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

 import cn.com.taiji.core.model.comm.protocol.SignServiceType;
 
 public enum IasServiceCmd implements SignServiceCommand {
-    BILLRAISEINSERT("发票抬头添加","BillRaiseInsert", BillRaiseInsertRequest.class),
-    BILLRAISEDELETE("发票抬头删除","BillRaiseDelete", BillRaiseDeleteRequest.class),
-    BILLRAISEUPDATE("发票抬头修改","BillRaiseUpdate", BillRaiseUpdateRequest.class),
-    BILLRECORD("发票开票记录","BillRecord", BillRecordRequest.class),
-    BILLREVERSAL("发票红冲","BillReversal", BillReversalRequest.class),
+    BILLRAISEINSERT("发票抬头添加","billRaiseInsert", BillRaiseInsertRequest.class),
+    BILLRAISEDELETE("发票抬头删除","billRaiseDelete", BillRaiseDeleteRequest.class),
+    BILLRAISEUPDATE("发票抬头修改","billRaiseUpdate", BillRaiseUpdateRequest.class),
+    BILLRECORD("发票开票记录","billRecord", BillRecordRequest.class),
+    BILLREVERSAL("发票红冲","billReversal", BillReversalRequest.class),
 
     ;
 

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

+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.NotNull;
+
+@Getter
+@Setter
+public class BillRaiseDeleteRequest extends AbstractIasRequest<BillRaiseDeleteResponse> {
+    protected BillRaiseDeleteRequest() {
+        super(IasServiceCmd.BILLRAISEDELETE);
+    }
+
+    /** 抬头记录id*/
+    @JsonProperty(value = "Id")
+    @NotNull(message = "抬头记录id不能为空")
+    private String id;
+    /** 客户手机号*/
+    @JsonProperty(value = "UserMobile")
+    @NotNull(message = "手机号不能为空")
+    private String userMobile;
+
+    @JsonProperty(value = "OpenId")
+    private String openId;
+    @JsonProperty(value = "LoginSource")
+    private String loginSource;
+}

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

+package cn.com.taiji.core.model.comm.protocol.ias.bill;
+
+import cn.com.taiji.core.model.comm.protocol.ias.AbstractIasResponse;
+
+public class BillRaiseDeleteResponse extends AbstractIasResponse {
+}

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

+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.NotNull;
+
+@Getter
+@Setter
+public class BillRaiseInsertRequest extends AbstractIasRequest<BillRaiseInsertResponse> {
+    protected BillRaiseInsertRequest() {
+        super(IasServiceCmd.BILLRAISEINSERT);
+    }
+
+    /**
+     * 抬头类型 1：单位抬头；2：个人抬头
+     */
+    @JsonProperty(value = "TitleType")
+    @NotNull(message = "抬头类型不能为空")
+    private Integer titleType;
+    /**
+     * 客户手机号
+     */
+    @JsonProperty(value = "UserMobile")
+    @NotNull(message = "手机号不能为空")
+    private String userMobile;
+    /**
+     * 是否为默认抬头 1：默认抬头；-1：非默认抬头；
+     */
+    @JsonProperty(value = "IsDefault")
+    @NotNull(message = "是否为默认抬头不能为空")
+    private Integer isDefault;
+    /**
+     * 抬头名称
+     */
+    @JsonProperty(value = "BuyerName")
+    @NotNull(message = "抬头名称不能为空")
+    private String buyerName;
+    /**
+     * 纳税人识别号 抬头类型为单位时必填
+     */
+    @JsonProperty(value = "BuyerTaxNo")
+    private String buyerTaxNo;
+    /**
+     * 单位地址
+     */
+    @JsonProperty(value = "CompanyAddress")
+    private String companyAddress;
+    /**
+     * 公司电话号码
+     */
+    @JsonProperty(value = "CompanyTel")
+    private String companyTel;
+    /**
+     * 开户银行
+     */
+    @JsonProperty(value = "BankName")
+    private String bankName;
+    /**
+     * 银行账号
+     */
+    @JsonProperty(value = "BankAccount")
+    private String bankAccount;
+
+    @JsonProperty(value = "OpenId")
+    private String openId;
+    @JsonProperty(value = "LoginSource")
+    private String loginSource;
+}

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

+package cn.com.taiji.core.model.comm.protocol.ias.bill;
+
+import cn.com.taiji.core.model.comm.protocol.ias.AbstractIasResponse;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import lombok.Getter;
+import lombok.Setter;
+
+@Getter
+@Setter
+public class BillRaiseInsertResponse extends AbstractIasResponse {
+    /** 发票抬头ID*/
+    @JsonProperty(value = "Id")
+    private String id;
+}

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

+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.NotNull;
+
+@Getter
+@Setter
+public class BillRaiseUpdateRequest extends AbstractIasRequest<BillRaiseUpdateResponse> {
+    protected BillRaiseUpdateRequest() {
+        super(IasServiceCmd.BILLRAISEUPDATE);
+    }
+
+    /**
+     * 抬头记录id
+     */
+    @JsonProperty(value = "Id")
+    @NotNull(message = "抬头记录id不能为空")
+    private String id;
+    /**
+     * 客户手机号
+     */
+    @JsonProperty(value = "UserMobile")
+    @NotNull(message = "手机号不能为空")
+    private String userMobile;
+    /**
+     * 是否为默认抬头 1：默认抬头；-1：非默认抬头；
+     */
+    @JsonProperty(value = "IsDefault")
+    @NotNull(message = "是否为默认抬头不能为空")
+    private Integer isDefault;
+    /**
+     * 抬头名称
+     */
+    @JsonProperty(value = "BuyerName")
+    @NotNull(message = "抬头名称不能为空")
+    private String buyerName;
+    /**
+     * 纳税人识别号 抬头类型为单位时必填
+     */
+    @JsonProperty(value = "BuyerTaxNo")
+    private String buyerTaxNo;
+    /**
+     * 单位地址
+     */
+    @JsonProperty(value = "CompanyAddress")
+    private String companyAddress;
+    /**
+     * 公司电话号码
+     */
+    @JsonProperty(value = "CompanyTel")
+    private String companyTel;
+    /**
+     * 开户银行
+     */
+    @JsonProperty(value = "BankName")
+    private String bankName;
+    /**
+     * 银行账号
+     */
+    @JsonProperty(value = "BankAccount")
+    private String bankAccount;
+
+    @JsonProperty(value = "OpenId")
+    private String openId;
+    @JsonProperty(value = "LoginSource")
+    private String loginSource;
+}

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

+package cn.com.taiji.core.model.comm.protocol.ias.bill;
+
+import cn.com.taiji.core.model.comm.protocol.ias.AbstractIasResponse;
+
+public class BillRaiseUpdateResponse extends AbstractIasResponse {
+}

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

+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.NotNull;
+
+@Getter
+@Setter
+public class BillRecordRequest extends AbstractIasRequest<BillRecordResponse> {
+    protected BillRecordRequest() {
+        super(IasServiceCmd.BILLRECORD);
+    }
+    /** 状态 正常_1,红冲_-1*/
+    @JsonProperty(value = "Status")
+    private Integer status;
+    /** 订单类型 ETC产品_1,通行服务费_2*/
+    @JsonProperty(value = "OrderType")
+    private Integer orderType;
+    /** 开票开始日期*/
+    @JsonProperty(value = "StartDate")
+    private String startDate;
+    /** 开票结束日期*/
+    @JsonProperty(value = "EndDate")
+    private String endDate;
+    /** 页码*/
+    @JsonProperty(value = "PageNumber")
+    private Integer pageNumber;
+    /** 每页大小*/
+    @JsonProperty(value = "PageSize")
+    private Integer pageSize;
+    /** 手机号*/
+    @JsonProperty(value = "UserMobile")
+    @NotNull(message = "手机号不能为空")
+    private String userMobile;
+    /** 操作来源*/
+    @JsonProperty(value = "OperationSource")
+    private String operationSource;
+    /** 操作用户ID*/
+    @JsonProperty(value = "OperationUserId")
+    private String operationUserId;
+    @JsonProperty(value = "OpenId")
+    private String openId;
+}

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

+package cn.com.taiji.core.model.comm.protocol.ias.bill;
+
+import cn.com.taiji.core.model.comm.protocol.ias.AbstractIasResponse;
+
+public class BillRecordResponse extends AbstractIasResponse {
+}

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

+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;
+
+public class BillReversalRequest extends AbstractIasRequest<BillReversalResponse> {
+    protected BillReversalRequest() {
+        super(IasServiceCmd.BILLREVERSAL);
+    }
+}

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

+package cn.com.taiji.core.model.comm.protocol.ias.bill;
+
+import cn.com.taiji.core.model.comm.protocol.ias.AbstractIasResponse;
+
+public class BillReversalResponse extends AbstractIasResponse {
+}