目录结构调整

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

@@ -6,23 +6,23 @@ import cn.com.taiji.core.model.comm.protocol.SignServiceType;
 import cn.com.taiji.core.model.comm.protocol.ias.IasServiceType;
 
 public enum BillServiceCmd implements SignServiceCommand {
-    BILLRAISEINSERT("发票抬头添加","billRaiseInsert", BillRaiseInsertRequest.class),
-    BILLRAISEDELETE("发票抬头删除","billRaiseDelete", BillRaiseDeleteRequest.class),
-    BILLRAISEUPDATE("发票抬头修改","billRaiseUpdate", BillRaiseUpdateRequest.class),
-    BILLRECORD("发票开票记录","billRecord", BillRecordRequest.class),
-    BILLREVERSAL("发票红冲","billReversal", BillReversalRequest.class),
-    BILLMERGEINVOICING("ETC产品合并开票","billMergeInvoicing", BillMergeInvoicingRequest.class),
+    BILLRAISEINSERT("发票抬头添加","/qtzlinvoice/addInvoiceTitle", BillRaiseInsertRequest.class),
+    BILLRAISEDELETE("发票抬头删除","/qtzlinvoice/deleteInvoiceTitle", BillRaiseDeleteRequest.class),
+    BILLRAISEUPDATE("发票抬头修改","/qtzlinvoice/editInvoiceTitle", BillRaiseUpdateRequest.class),
+    BILLRECORD("发票开票记录","/qtzlinvoice/queryInvoice", BillRecordRequest.class),
+    BILLREVERSAL("发票红冲","/qtzlinvoice/invocieReversal", BillReversalRequest.class),
+    BILLMERGEINVOICING("ETC产品合并开票","/qtzlinvoice/batchOpenEtcProductInvoice", BillMergeInvoicingRequest.class),
     BILLORDERPUSH("发票订单补推","billOrderPush", BillOrderPushLogRequest.class),
 
     ;
 
     private final String value;
-    private final String transCode;
+    private final String txCode;
     private final Class<? extends AbstractSignTypeRequest<?>> reqClass;
 
-    BillServiceCmd(String value, String transCode, Class<? extends AbstractSignTypeRequest<?>> reqClass) {
+    BillServiceCmd(String value, String txCode, Class<? extends AbstractSignTypeRequest<?>> reqClass) {
         this.value = value;
-        this.transCode = transCode;
+        this.txCode = txCode;
         this.reqClass = reqClass;
     }
 
@@ -44,8 +44,8 @@ public enum BillServiceCmd implements SignServiceCommand {
     public String getValue() {
         return value;
     }
-    public String getTransCode() {
-        return transCode;
+    public String getTxCode() {
+        return txCode;
     }
 
     @Override

zhywpt-service-ats/src/main/java/cn/com/taiji/ats/manager/anXin/AnXinBusinessManagerImpl.java

@@ -1,7 +1,7 @@
 package cn.com.taiji.ats.manager.anXin;
 
-import cn.com.taiji.ats.manager.anXin.model.InterfaceRequest;
-import cn.com.taiji.ats.manager.anXin.model.InterfaceResponse;
+import cn.com.taiji.ats.model.anXin.InterfaceRequest;
+import cn.com.taiji.ats.model.anXin.InterfaceResponse;
 import cn.com.taiji.common.manager.AbstractManager;
 import cn.com.taiji.common.pub.json.JsonTools;
 import cn.com.taiji.core.model.comm.protocol.ats.AbstractAtsRequest;

zhywpt-service-ats/src/main/java/cn/com/taiji/ats/manager/anXin/AnXinService.java

@@ -1,7 +1,7 @@
 package cn.com.taiji.ats.manager.anXin;
 
-import cn.com.taiji.ats.manager.anXin.model.InterfaceRequest;
-import cn.com.taiji.ats.manager.anXin.model.InterfaceResponse;
+import cn.com.taiji.ats.model.anXin.InterfaceRequest;
+import cn.com.taiji.ats.model.anXin.InterfaceResponse;
 
 public interface AnXinService {
     InterfaceResponse post(InterfaceRequest interfaceRequest) throws Exception;

zhywpt-service-ats/src/main/java/cn/com/taiji/ats/manager/anXin/AnXinServiceImpl.java

@@ -4,8 +4,8 @@ import cfca.trustsign.common.util.CommonUtil;
 import cfca.trustsign.common.vo.cs.HeadVO;
 import cn.com.taiji.ats.manager.anXin.connector.HttpConnector;
 import cn.com.taiji.ats.manager.anXin.constant.Request;
-import cn.com.taiji.ats.manager.anXin.model.InterfaceRequest;
-import cn.com.taiji.ats.manager.anXin.model.InterfaceResponse;
+import cn.com.taiji.ats.model.anXin.InterfaceRequest;
+import cn.com.taiji.ats.model.anXin.InterfaceResponse;
 import cn.com.taiji.ats.tools.SecurityUtil;
 import cn.com.taiji.ats.tools.TimeUtil;
 import cn.com.taiji.common.manager.AbstractManager;

zhywpt-service-ias/src/main/java/cn/com/taiji/ias/manager/bill/BillBusinessManager.java

@@ -4,17 +4,17 @@ import cn.com.taiji.core.model.comm.protocol.ias.bill.*;
 
 public interface BillBusinessManager {
 
-    BillRaiseInsertResponse billRaiseInsert(BillRaiseInsertRequest req) throws Exception;
+    BillRaiseInsertResponse billRaiseInsert(BillRaiseInsertRequest req, String txCode) throws Exception;
 
-    BillRaiseDeleteResponse billRaiseDelete(BillRaiseDeleteRequest req) throws Exception;
+    BillRaiseDeleteResponse billRaiseDelete(BillRaiseDeleteRequest req, String txCode) throws Exception;
 
-    BillRaiseUpdateResponse billRaiseUpdate(BillRaiseUpdateRequest req) throws Exception;
+    BillRaiseUpdateResponse billRaiseUpdate(BillRaiseUpdateRequest req, String txCode) throws Exception;
 
-    BillRecordResponse billRecord(BillRecordRequest req) throws Exception;
+    BillRecordResponse billRecord(BillRecordRequest req, String txCode) throws Exception;
 
-    BillReversalResponse billReversal(BillReversalRequest req) throws Exception;
+    BillReversalResponse billReversal(BillReversalRequest req, String txCode) throws Exception;
 
-    BillMergeInvoicingResponse billMergeInvoicing(BillMergeInvoicingRequest req) throws Exception;
+    BillMergeInvoicingResponse billMergeInvoicing(BillMergeInvoicingRequest req, String txCode) throws Exception;
 
     BillOrderPushLogResponse billOrderPush(BillOrderPushLogRequest req) throws Exception;
 }

zhywpt-service-ias/src/main/java/cn/com/taiji/ias/manager/bill/BillBusinessManagerImpl.java

@@ -6,9 +6,8 @@ import cn.com.taiji.core.model.comm.protocol.ias.AbstractIasRequest;
 import cn.com.taiji.core.model.comm.protocol.ias.AbstractIasResponse;
 import cn.com.taiji.core.model.comm.protocol.ias.bill.*;
 import cn.com.taiji.core.model.comm.protocol.valid.GlyServiceError;
-import cn.com.taiji.ias.manager.bill.model.HtlRequestMethod;
 import cn.com.taiji.ias.model.bill.InterfaceRequest;
-import cn.com.taiji.ias.manager.bill.model.InterfaceResponse;
+import cn.com.taiji.ias.model.bill.InterfaceResponse;
 import cn.com.taiji.ias.tools.HttpClientUtil;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -33,38 +32,38 @@ public class BillBusinessManagerImpl extends AbstractManager implements BillBusi
 
     /** 发票抬头添加*/
     @Override
-    public BillRaiseInsertResponse billRaiseInsert(BillRaiseInsertRequest request) throws Exception {
-        return processBillRequest(HtlRequestMethod.BILLRAISEINSERT.getUri(), request, BillRaiseInsertResponse.class);
+    public BillRaiseInsertResponse billRaiseInsert(BillRaiseInsertRequest request, String txCode) throws Exception {
+        return processBillRequest(txCode, request, BillRaiseInsertResponse.class);
     }
 
     /** 发票抬头删除*/
     @Override
-    public BillRaiseDeleteResponse billRaiseDelete(BillRaiseDeleteRequest request) throws Exception {
-        return processBillRequest(HtlRequestMethod.BILLRAISEDELETE.getUri(), request, BillRaiseDeleteResponse.class);
+    public BillRaiseDeleteResponse billRaiseDelete(BillRaiseDeleteRequest request, String txCode) throws Exception {
+        return processBillRequest(txCode, request, BillRaiseDeleteResponse.class);
     }
 
     /** 发票抬头修改*/
     @Override
-    public BillRaiseUpdateResponse billRaiseUpdate(BillRaiseUpdateRequest req) throws Exception {
-        return processBillRequest(HtlRequestMethod.BILLRAISEUPDATE.getUri(), req, BillRaiseUpdateResponse.class);
+    public BillRaiseUpdateResponse billRaiseUpdate(BillRaiseUpdateRequest req, String txCode) throws Exception {
+        return processBillRequest(txCode, req, BillRaiseUpdateResponse.class);
     }
 
     /** 发票开票记录*/
     @Override
-    public BillRecordResponse billRecord(BillRecordRequest req) throws Exception {
-        return processBillRequest(HtlRequestMethod.BILLRECORD.getUri(), req, BillRecordResponse.class);
+    public BillRecordResponse billRecord(BillRecordRequest req, String txCode) throws Exception {
+        return processBillRequest(txCode, req, BillRecordResponse.class);
     }
 
     /** 发票红冲*/
     @Override
-    public BillReversalResponse billReversal(BillReversalRequest req) throws Exception {
-        return processBillRequest(HtlRequestMethod.BILLREVERSAL.getUri(), req, BillReversalResponse.class);
+    public BillReversalResponse billReversal(BillReversalRequest req, String txCode) throws Exception {
+        return processBillRequest(txCode, req, BillReversalResponse.class);
     }
 
     /** ETC产品合并开票*/
     @Override
-    public BillMergeInvoicingResponse billMergeInvoicing(BillMergeInvoicingRequest req) throws Exception {
-        return processBillRequest(HtlRequestMethod.BILLMERGEINVOICING.getUri(), req, BillMergeInvoicingResponse.class);
+    public BillMergeInvoicingResponse billMergeInvoicing(BillMergeInvoicingRequest req, String txCode) throws Exception {
+        return processBillRequest(txCode, req, BillMergeInvoicingResponse.class);
     }
 
     /** 发票订单补推*/

zhywpt-service-ias/src/main/java/cn/com/taiji/ias/manager/bill/HltService.java

@@ -1,7 +1,7 @@
 package cn.com.taiji.ias.manager.bill;
 
 import cn.com.taiji.ias.model.bill.InterfaceRequest;
-import cn.com.taiji.ias.manager.bill.model.InterfaceResponse;
+import cn.com.taiji.ias.model.bill.InterfaceResponse;
 
 public interface HltService {
     /**

zhywpt-service-ias/src/main/java/cn/com/taiji/ias/manager/bill/HltServiceImpl.java

@@ -4,7 +4,7 @@ import cn.com.taiji.common.pub.json.JsonTools;
 import cn.com.taiji.ias.model.bill.HltRequest;
 import cn.com.taiji.ias.model.bill.HltResponse;
 import cn.com.taiji.ias.model.bill.InterfaceRequest;
-import cn.com.taiji.ias.manager.bill.model.InterfaceResponse;
+import cn.com.taiji.ias.model.bill.InterfaceResponse;
 import cn.com.taiji.ias.tools.HttpClientUtil;
 import cn.com.taiji.ias.tools.NumberConvert;
 import cn.com.taiji.ias.tools.hlt.DesUtil;

zhywpt-service-ias/src/main/java/cn/com/taiji/ias/manager/handler/BillServiceHandler.java

@@ -29,17 +29,17 @@ public class BillServiceHandler extends AbstractIasServiceHandler<BillServiceCmd
         BillServiceCmd cmd = BillServiceCmd.fromIfCode(jsonReq.getIfCode());
         switch (cmd) {
             case BILLRAISEINSERT:
-                return billBusinessManager.billRaiseInsert((BillRaiseInsertRequest) request);
+                return billBusinessManager.billRaiseInsert((BillRaiseInsertRequest) request,cmd.getTxCode());
             case BILLRAISEDELETE:
-                return billBusinessManager.billRaiseDelete((BillRaiseDeleteRequest) request);
+                return billBusinessManager.billRaiseDelete((BillRaiseDeleteRequest) request,cmd.getTxCode());
             case BILLRAISEUPDATE:
-                return billBusinessManager.billRaiseUpdate((BillRaiseUpdateRequest) request);
+                return billBusinessManager.billRaiseUpdate((BillRaiseUpdateRequest) request,cmd.getTxCode());
             case BILLRECORD:
-                return billBusinessManager.billRecord((BillRecordRequest) request);
+                return billBusinessManager.billRecord((BillRecordRequest) request,cmd.getTxCode());
             case BILLREVERSAL:
-                return billBusinessManager.billReversal((BillReversalRequest) request);
+                return billBusinessManager.billReversal((BillReversalRequest) request,cmd.getTxCode());
             case BILLMERGEINVOICING:
-                return billBusinessManager.billMergeInvoicing((BillMergeInvoicingRequest) request);
+                return billBusinessManager.billMergeInvoicing((BillMergeInvoicingRequest) request,cmd.getTxCode());
             case BILLORDERPUSH:
                 return billBusinessManager.billOrderPush((BillOrderPushLogRequest) request);
             default:

zhywpt-service-ias/src/main/java/cn/com/taiji/ias/model/bill/HtlRequestMethod.java

@@ -1,62 +0,0 @@
-package cn.com.taiji.ias.model.bill;
-
-public enum HtlRequestMethod {
-    BILLRAISEINSERT("发票抬头添加","/qtzlinvoice/addInvoiceTitle",1),
-    BILLRAISEDELETE("发票抬头删除","/qtzlinvoice/deleteInvoiceTitle",2),
-    BILLRAISEUPDATE("发票抬头修改","/qtzlinvoice/editInvoiceTitle",3),
-    BILLRECORD("发票开票记录","/qtzlinvoice/queryInvoice",4),
-    BILLREVERSAL("发票红冲","/qtzlinvoice/invocieReversal",5),
-    BILLMERGEINVOICING("ETC产品合并开票","/qtzlinvoice/batchOpenEtcProductInvoice",6),
-    BILLORDERPUSH("发票订单补推","",7),
-    ;
-
-    private String value;
-    private String uri;
-    private int code;
-
-    HtlRequestMethod(String value, String uri, int code) {
-        this.value = value;
-        this.uri = uri;
-        this.code = code;
-    }
-    public static HtlRequestMethod getByCode(int code) {
-        for (HtlRequestMethod method : HtlRequestMethod.values()) {
-            if (method.getCode() == code) {
-                return method;
-            }
-        }
-        return null;
-    }
-    public static HtlRequestMethod getByValue(String value) {
-        for (HtlRequestMethod method : HtlRequestMethod.values()) {
-            if (method.getValue().equals(value)) {
-                return method;
-            }
-        }
-        return null;
-    }
-
-    public String getValue() {
-        return value;
-    }
-
-    public void setValue(String value) {
-        this.value = value;
-    }
-
-    public String getUri() {
-        return uri;
-    }
-
-    public void setUri(String uri) {
-        this.uri = uri;
-    }
-
-    public int getCode() {
-        return code;
-    }
-
-    public void setCode(int code) {
-        this.code = code;
-    }
-}