发票管理

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

@@ -4,6 +4,7 @@ import cn.com.taiji.core.manager.comm.client.CommServiceCommand;
 import cn.com.taiji.core.model.comm.protocol.SignServiceCommand;
 import cn.com.taiji.core.model.comm.protocol.SignServiceSystem;
 import cn.com.taiji.core.model.comm.protocol.SignServiceType;
+import cn.com.taiji.core.model.comm.protocol.ias.bill.BillServiceCmd;
 import cn.com.taiji.core.model.comm.protocol.ias.oqs.issue.OqsIssueCmd;
 import cn.com.taiji.core.model.comm.protocol.ias.oqs.order.OqsOrderCmd;
 import cn.com.taiji.core.model.comm.protocol.ias.province.ProvinceCmd;
@@ -14,7 +15,7 @@ import java.util.List;
 import java.util.regex.Pattern;
 
 public enum IasServiceType implements SignServiceType {
-    BILL("发票操作", "^BILL_\\S+\\.json$", IasServiceCmd.values()),
+    BILL("发票操作", "^BILL_\\S+\\.json$", BillServiceCmd.values()),
     PROVINCE("省中心","^PROVINCE_\\S+\\.json$", ProvinceCmd.values()),
     OQSISSUE("发行","^OQSISSUE_\\S+\\.json$", OqsIssueCmd.values()),
     OQSORDER("订单","^OQSORDER_\\S+\\.json$", OqsOrderCmd.values()),

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

@@ -1,7 +1,6 @@
 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;
@@ -15,7 +14,7 @@ import java.util.List;
 @Setter
 public class BillMergeInvoicingRequest extends AbstractIasRequest<BillMergeInvoicingResponse> {
     public BillMergeInvoicingRequest() {
-        super(IasServiceCmd.BILLMERGEINVOICING);
+        super(BillServiceCmd.BILLMERGEINVOICING);
     }
     /**
      * ETC产品订单号

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

@@ -1,7 +1,6 @@
 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;
@@ -13,7 +12,7 @@ import javax.validation.constraints.NotBlank;
 @Setter
 public class BillOrderPushLogRequest extends AbstractIasRequest<BillOrderPushLogResponse> {
     public BillOrderPushLogRequest() {
-        super(IasServiceCmd.BILLORDERPUSH);
+        super(BillServiceCmd.BILLORDERPUSH);
     }
     /** 订单号*/
     @JsonProperty(value = "OrderNo")

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

@@ -1,19 +1,18 @@
 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.NotNull;
+
 /** 发票抬头删除请求*/
 @Getter
 @Setter
 public class BillRaiseDeleteRequest extends AbstractIasRequest<BillRaiseDeleteResponse> {
     public BillRaiseDeleteRequest() {
-        super(IasServiceCmd.BILLRAISEDELETE);
+        super(BillServiceCmd.BILLRAISEDELETE);
     }
 
     /** 抬头记录id*/

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

@@ -1,7 +1,6 @@
 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;
@@ -13,7 +12,7 @@ import javax.validation.constraints.NotBlank;
 @Setter
 public class BillRaiseInsertRequest extends AbstractIasRequest<BillRaiseInsertResponse> {
     public BillRaiseInsertRequest() {
-        super(IasServiceCmd.BILLRAISEINSERT);
+        super(BillServiceCmd.BILLRAISEINSERT);
     }
 
     /**

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

@@ -1,7 +1,6 @@
 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;
@@ -13,7 +12,7 @@ import javax.validation.constraints.NotBlank;
 @Setter
 public class BillRaiseUpdateRequest extends AbstractIasRequest<BillRaiseUpdateResponse> {
     public BillRaiseUpdateRequest() {
-        super(IasServiceCmd.BILLRAISEUPDATE);
+        super(BillServiceCmd.BILLRAISEUPDATE);
     }
 
     /**

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

@@ -1,20 +1,18 @@
 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.NotNull;
 
 /** 发票开票记录请求*/
 @Getter
 @Setter
 public class BillRecordRequest extends AbstractIasRequest<BillRecordResponse> {
     public BillRecordRequest() {
-        super(IasServiceCmd.BILLRECORD);
+        super(BillServiceCmd.BILLRECORD);
     }
     /** 状态 正常_1,红冲_-1*/
     @JsonProperty(value = "Status")

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

@@ -1,7 +1,6 @@
 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;
@@ -13,7 +12,7 @@ import javax.validation.constraints.NotBlank;
 @Setter
 public class BillReversalRequest extends AbstractIasRequest<BillReversalResponse> {
     public BillReversalRequest() {
-        super(IasServiceCmd.BILLREVERSAL);
+        super(BillServiceCmd.BILLREVERSAL);
     }
     /** 开票流水号*/
     @JsonProperty(value = "SerialNo")

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

@@ -1,11 +1,11 @@
-package cn.com.taiji.core.model.comm.protocol.ias;
+package cn.com.taiji.core.model.comm.protocol.ias.bill;
 
 import cn.com.taiji.core.model.comm.protocol.AbstractSignTypeRequest;
 import cn.com.taiji.core.model.comm.protocol.SignServiceCommand;
 import cn.com.taiji.core.model.comm.protocol.SignServiceType;
-import cn.com.taiji.core.model.comm.protocol.ias.bill.*;
+import cn.com.taiji.core.model.comm.protocol.ias.IasServiceType;
 
-public enum IasServiceCmd implements SignServiceCommand {
+public enum BillServiceCmd implements SignServiceCommand {
     BILLRAISEINSERT("发票抬头添加","billRaiseInsert", BillRaiseInsertRequest.class),
     BILLRAISEDELETE("发票抬头删除","billRaiseDelete", BillRaiseDeleteRequest.class),
     BILLRAISEUPDATE("发票抬头修改","billRaiseUpdate", BillRaiseUpdateRequest.class),
@@ -20,7 +20,7 @@ public enum IasServiceCmd implements SignServiceCommand {
     private final String transCode;
     private final Class<? extends AbstractSignTypeRequest<?>> reqClass;
 
-    IasServiceCmd(String value,String transCode, Class<? extends AbstractSignTypeRequest<?>> reqClass) {
+    BillServiceCmd(String value, String transCode, Class<? extends AbstractSignTypeRequest<?>> reqClass) {
         this.value = value;
         this.transCode = transCode;
         this.reqClass = reqClass;
@@ -31,8 +31,8 @@ public enum IasServiceCmd implements SignServiceCommand {
         return IasServiceType.BILL;
     }
 
-    public static IasServiceCmd fromIfCode(String ifCode) {
-        return SignServiceCommand.fromName(IasServiceCmd.class, SignServiceCommand.getCmdStr(ifCode));
+    public static BillServiceCmd fromIfCode(String ifCode) {
+        return SignServiceCommand.fromName(BillServiceCmd.class, SignServiceCommand.getCmdStr(ifCode));
     }
 
     @Override