发票接口修改

gly-base-core/src/main/java/cn/com/taiji/core/model/comm/protocol/ats/AtsServiceType.java

@@ -5,6 +5,7 @@ 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.ats.anXin.AnXinServiceCmd;
+import cn.com.taiji.core.model.comm.protocol.ats.bill.BillOpenCmd;
 import cn.com.taiji.core.model.comm.protocol.ats.notice.NoticeServiceCmd;
 import cn.com.taiji.core.model.comm.protocol.ats.jpush.JPushServiceCmd;
 import cn.com.taiji.core.model.comm.protocol.ats.ocr.OcrServiceCmd;
@@ -21,6 +22,7 @@ public enum AtsServiceType implements SignServiceType {
     OCR("ocr","^OCR\\S+\\.json$", OcrServiceCmd.values()),
     JPUSH("极光发送","^JPUSH\\S+\\.json$", JPushServiceCmd.values()),
     NOTICE("通知","^NOTICE_\\S+\\.json$", NoticeServiceCmd.values()),
+    BILL("发票","^BILL_\\S+\\.json$", BillOpenCmd.values()),
     ;
 
     @Getter

gly-base-core/src/main/java/cn/com/taiji/core/model/comm/protocol/ods/bill/BillCommResponse.java → gly-base-core/src/main/java/cn/com/taiji/core/model/comm/protocol/ats/bill/BillCommResponse.java

@@ -1,4 +1,4 @@
-package cn.com.taiji.core.model.comm.protocol.ods.bill;
+package cn.com.taiji.core.model.comm.protocol.ats.bill;
 
 import cn.com.taiji.core.model.comm.protocol.AbstractSignTypeResponse;
 import lombok.Getter;

gly-base-core/src/main/java/cn/com/taiji/core/model/comm/protocol/ods/bill/BillOpenCmd.java → gly-base-core/src/main/java/cn/com/taiji/core/model/comm/protocol/ats/bill/BillOpenCmd.java

@@ -1,9 +1,9 @@
-package cn.com.taiji.core.model.comm.protocol.ods.bill;
+package cn.com.taiji.core.model.comm.protocol.ats.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.ods.OdsServiceType;
+import cn.com.taiji.core.model.comm.protocol.ats.AtsServiceType;
 
 public enum BillOpenCmd implements SignServiceCommand {
     OPEN("开票", BillOpenRequest.class),
@@ -21,7 +21,7 @@ public enum BillOpenCmd implements SignServiceCommand {
 
     @Override
     public SignServiceType getServiceType() {
-        return OdsServiceType.BILL;
+        return AtsServiceType.BILL;
     }
 
     public static BillOpenCmd fromIfCode(String ifCode) {

gly-base-core/src/main/java/cn/com/taiji/core/model/comm/protocol/ods/bill/BillOpenRequest.java → gly-base-core/src/main/java/cn/com/taiji/core/model/comm/protocol/ats/bill/BillOpenRequest.java

@@ -1,7 +1,7 @@
-package cn.com.taiji.core.model.comm.protocol.ods.bill;
+package cn.com.taiji.core.model.comm.protocol.ats.bill;
 
 import cn.com.taiji.core.model.comm.protocol.AbstractSignTypeRequest;
-import cn.com.taiji.core.model.comm.protocol.ods.bill.model.BillOpenModel;
+import cn.com.taiji.core.model.comm.protocol.ats.bill.model.BillOpenModel;
 import com.fasterxml.jackson.annotation.JsonInclude;
 import lombok.Getter;
 import lombok.Setter;

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

@@ -1,4 +1,4 @@
-package cn.com.taiji.core.model.comm.protocol.ods.bill;
+package cn.com.taiji.core.model.comm.protocol.ats.bill;
 
 import cn.com.taiji.core.model.comm.protocol.AbstractSignTypeRequest;
 import lombok.Getter;

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

@@ -1,4 +1,4 @@
-package cn.com.taiji.core.model.comm.protocol.ods.bill;
+package cn.com.taiji.core.model.comm.protocol.ats.bill;
 
 import cn.com.taiji.core.model.comm.protocol.AbstractSignTypeResponse;
 import lombok.Getter;

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

@@ -1,7 +1,7 @@
-package cn.com.taiji.core.model.comm.protocol.ods.bill;
+package cn.com.taiji.core.model.comm.protocol.ats.bill;
 
 import cn.com.taiji.core.model.comm.protocol.AbstractSignTypeRequest;
-import cn.com.taiji.core.model.comm.protocol.ods.bill.model.BillOpenModel;
+import cn.com.taiji.core.model.comm.protocol.ats.bill.model.BillOpenModel;
 import com.fasterxml.jackson.annotation.JsonInclude;
 import lombok.Getter;
 import lombok.Setter;

gly-base-core/src/main/java/cn/com/taiji/core/model/comm/protocol/ods/bill/model/BillOpenModel.java → gly-base-core/src/main/java/cn/com/taiji/core/model/comm/protocol/ats/bill/model/BillOpenModel.java

@@ -1,4 +1,4 @@
-package cn.com.taiji.core.model.comm.protocol.ods.bill.model;
+package cn.com.taiji.core.model.comm.protocol.ats.bill.model;
 
 import cn.com.taiji.common.model.BaseModel;
 import com.fasterxml.jackson.annotation.JsonInclude;

gly-base-core/src/main/java/cn/com/taiji/core/model/comm/protocol/ods/OdsServiceType.java

@@ -4,7 +4,6 @@ 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.ods.bill.BillOpenCmd;
 import cn.com.taiji.core.model.comm.protocol.ods.ois.ass.OisAssCmd;
 import cn.com.taiji.core.model.comm.protocol.ods.ois.issue.OisIssueCmd;
 import cn.com.taiji.core.model.comm.protocol.ods.oqs.issue.OqsIssueCmd;
@@ -20,7 +19,6 @@ public enum OdsServiceType implements SignServiceType {
     OQSORDER("订单","^OQSORDER_\\S+\\.json$", OqsOrderCmd.values()),
     OISISSUE("发行","^OISISSUE_\\S+\\.json$", OisIssueCmd.values()),
     OISASS("售后","^OISASS_\\S+\\.json$", OisAssCmd.values()),
-    BILL("发票","^BILL_\\S+\\.json$", BillOpenCmd.values()),
     ;
 
     @Getter

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

@@ -29,6 +29,8 @@ public class MyCommHandleManager extends AbstractCommHandleManager {
     private NoticeServiceHandler noticeServiceHandler;
     @Autowired
     private JPushServiceHandler jPushServiceHandler;
+    @Autowired
+    private BillOpenServiceHandler billOpenServiceHandler;
 
     public MyCommHandleManager() {
         super(AtsServiceSystem.ATS);
@@ -44,6 +46,7 @@ public class MyCommHandleManager extends AbstractCommHandleManager {
         registerJsonService(ocrServiceHandler);
         registerJsonService(noticeServiceHandler);
         registerJsonService(jPushServiceHandler);
+        registerJsonService(billOpenServiceHandler);
     }
 
     @Override

zhywpt-service-ods/src/main/java/cn/com/taiji/ods/manager/bill/BillOpenManager.java → zhywpt-service-ats/src/main/java/cn/com/taiji/ats/manager/bill/BillOpenManager.java

@@ -1,8 +1,8 @@
-package cn.com.taiji.ods.manager.bill;
+package cn.com.taiji.ats.manager.bill;
 
 import cn.com.taiji.common.manager.net.http.ServiceHandleException;
-import cn.com.taiji.core.model.comm.protocol.ods.bill.BillOpenRequest;
-import cn.com.taiji.core.model.comm.protocol.ods.bill.BillCommResponse;
+import cn.com.taiji.core.model.comm.protocol.ats.bill.BillCommResponse;
+import cn.com.taiji.core.model.comm.protocol.ats.bill.BillOpenRequest;
 
 public interface BillOpenManager {
     BillCommResponse serviceHandle(BillOpenRequest request) throws ServiceHandleException;

zhywpt-service-ods/src/main/java/cn/com/taiji/ods/manager/bill/BillOpenManagerImpl.java → zhywpt-service-ats/src/main/java/cn/com/taiji/ats/manager/bill/BillOpenManagerImpl.java

@@ -1,14 +1,12 @@
-package cn.com.taiji.ods.manager.bill;
+package cn.com.taiji.ats.manager.bill;
 
+import cn.com.taiji.ats.model.bill.HltResponse;
 import cn.com.taiji.common.manager.AbstractManager;
 import cn.com.taiji.common.manager.net.http.ServiceHandleException;
 import cn.com.taiji.common.pub.json.JsonTools;
-import cn.com.taiji.core.entity.log.LogBillInterface;
-import cn.com.taiji.core.manager.comm.LogManager;
-import cn.com.taiji.core.model.comm.protocol.ods.bill.BillCommResponse;
-import cn.com.taiji.core.model.comm.protocol.ods.bill.BillOpenRequest;
-import cn.com.taiji.core.repo.jpa.log.LogBillInterfaceRepo;
-import cn.com.taiji.ods.model.bill.HltResponse;
+import cn.com.taiji.core.model.comm.protocol.ats.bill.BillCommResponse;
+import cn.com.taiji.core.model.comm.protocol.ats.bill.BillOpenRequest;
+import cn.com.taiji.core.model.comm.protocol.valid.GlyServiceError;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -19,16 +17,12 @@ import org.springframework.web.client.HttpServerErrorException;
 import java.io.IOException;
 
 @Service
-public class BillOpenManagerImpl extends AbstractManager
-        implements BillOpenManager, LogManager<BillOpenRequest, BillCommResponse, LogBillInterface> {
+public class BillOpenManagerImpl extends AbstractManager implements BillOpenManager{
     Logger logger = LoggerFactory.getLogger(BillOpenManagerImpl.class);
 
     @Autowired
     private HltService hltService;
 
-    @Autowired
-    private LogBillInterfaceRepo logRepo;
-
     @Override
     public BillCommResponse serviceHandle(BillOpenRequest request) throws ServiceHandleException {
         logger.info("请求汇联通开始，请求参数: {}", request);
@@ -39,30 +33,23 @@ public class BillOpenManagerImpl extends AbstractManager
 
             if ("0000".equals(response.getRespCode())) {
                 try {
-                    BillCommResponse commResponse = JsonTools.json2Object(response.getData(), BillCommResponse.class);
-                    return onSuccess(request, commResponse, LogBillInterface.class, System.currentTimeMillis() - begin);
+                    return JsonTools.json2Object(response.getData(), BillCommResponse.class);
                 } catch (IOException e) {
                     logger.error("汇联通响应解析异常: {}", e.getMessage(), e);
-                    throw exception(request, LogBillInterface.class, "接口错误：汇联通接口返回值格式错误！");
+                    throw GlyServiceError.BUSINESS_VALIDATE_ERR.toHandleException( "接口错误：汇联通接口返回值格式错误！");
                 }
             } else {
                 logger.error("汇联通响应异常，状态码: {}, 错误信息: {}", response.getRespCode(), response.getRespMessage());
-                throw exception(request, LogBillInterface.class,
+                throw GlyServiceError.BUSINESS_VALIDATE_ERR.toHandleException(
                         String.format("接口错误：汇联通响应异常！状态码：%s，错误信息：%s", response.getRespCode(), response.getRespMessage()));
             }
         } catch (HttpClientErrorException | HttpServerErrorException e) {
             logger.error("HTTP请求异常，状态码: {}, 错误信息: {}", e.getStatusCode(), e.getResponseBodyAsString(), e);
-            throw exception(request, LogBillInterface.class,
+            throw GlyServiceError.BUSINESS_VALIDATE_ERR.toHandleException(
                     String.format("接口错误：HTTP请求异常！状态码：%s，错误信息：%s", e.getStatusCode(), e.getResponseBodyAsString()));
         } catch (Exception e) {
             logger.error("请求汇联通异常: {}", e.getMessage(), e);
-            throw exception(request, LogBillInterface.class, "接口错误：请求汇联通异常！");
+            throw GlyServiceError.BUSINESS_VALIDATE_ERR.toHandleException( "接口错误：请求汇联通异常！");
         }
     }
-
-    @Override
-    public void doSaveLog(BillOpenRequest request, BillCommResponse response, LogBillInterface log) {
-        logger.info("enter do save log");
-        logRepo.persist(log);
-    }
 }

zhywpt-service-ods/src/main/java/cn/com/taiji/ods/manager/bill/BillOrderPushManager.java → zhywpt-service-ats/src/main/java/cn/com/taiji/ats/manager/bill/BillOrderPushManager.java

@@ -1,8 +1,8 @@
-package cn.com.taiji.ods.manager.bill;
+package cn.com.taiji.ats.manager.bill;
 
 import cn.com.taiji.common.manager.net.http.ServiceHandleException;
-import cn.com.taiji.core.model.comm.protocol.ods.bill.BillOrderPushLogResponse;
-import cn.com.taiji.core.model.comm.protocol.ods.bill.BillOrderPushLogRequest;
+import cn.com.taiji.core.model.comm.protocol.ats.bill.BillOrderPushLogRequest;
+import cn.com.taiji.core.model.comm.protocol.ats.bill.BillOrderPushLogResponse;
 
 public interface BillOrderPushManager {
     BillOrderPushLogResponse serviceHandle(BillOrderPushLogRequest request) throws ServiceHandleException;

zhywpt-service-ats/src/main/java/cn/com/taiji/ats/manager/bill/BillOrderPushManagerImpl.java

@@ -0,0 +1,46 @@
+package cn.com.taiji.ats.manager.bill;
+
+import cn.com.taiji.common.manager.AbstractManager;
+import cn.com.taiji.common.manager.net.http.ServiceHandleException;
+import cn.com.taiji.common.pub.json.JsonTools;
+import cn.com.taiji.core.manager.tools.http.HttpClientUtil;
+import cn.com.taiji.core.model.comm.protocol.ats.bill.BillOrderPushLogRequest;
+import cn.com.taiji.core.model.comm.protocol.ats.bill.BillOrderPushLogResponse;
+import cn.com.taiji.core.model.comm.protocol.valid.GlyServiceError;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.stereotype.Service;
+
+import java.io.IOException;
+
+@Service
+public class BillOrderPushManagerImpl extends AbstractManager implements BillOrderPushManager{
+
+    @Value("${orderNotice.url}")
+    private String orderNoticeUrl;
+
+    @Override
+    public BillOrderPushLogResponse serviceHandle(BillOrderPushLogRequest request) throws ServiceHandleException {
+        logger.info("请求发票订单请求参数:{}", request);
+        long begin = System.currentTimeMillis();
+        String response = null;
+        try {
+            response = HttpClientUtil.sendPost(orderNoticeUrl, request.toJson(), null);
+        } catch (IOException e) {
+            e.printStackTrace();
+            throw GlyServiceError.BUSINESS_VALIDATE_ERR.toHandleException( "接口错误：发票订单补推响应异常！");
+        }
+        logger.info("请求发票订单响应参数:{}", response);
+        if (hasText(response)) {
+            try {
+                return JsonTools.json2Object(response, BillOrderPushLogResponse.class);
+            } catch (IOException e) {
+                logger.error("发票订单补推响应异常:{}", e.getMessage(), e);
+                throw GlyServiceError.BUSINESS_VALIDATE_ERR.toHandleException( "接口错误：发票订单补推响应异常！");
+            }
+
+        } else {
+            logger.error("发票订单补推响应异常");
+            throw GlyServiceError.BUSINESS_VALIDATE_ERR.toHandleException( "接口错误：发票订单补推响应异常！");
+        }
+    }
+}

zhywpt-service-ods/src/main/java/cn/com/taiji/ods/manager/bill/BillReversalManager.java → zhywpt-service-ats/src/main/java/cn/com/taiji/ats/manager/bill/BillReversalManager.java

@@ -1,8 +1,8 @@
-package cn.com.taiji.ods.manager.bill;
+package cn.com.taiji.ats.manager.bill;
 
 import cn.com.taiji.common.manager.net.http.ServiceHandleException;
-import cn.com.taiji.core.model.comm.protocol.ods.bill.BillReversalRequest;
-import cn.com.taiji.core.model.comm.protocol.ods.bill.BillCommResponse;
+import cn.com.taiji.core.model.comm.protocol.ats.bill.BillCommResponse;
+import cn.com.taiji.core.model.comm.protocol.ats.bill.BillReversalRequest;
 
 public interface BillReversalManager {
     BillCommResponse serviceHandle(BillReversalRequest request) throws ServiceHandleException;

zhywpt-service-ods/src/main/java/cn/com/taiji/ods/manager/bill/BillReversalManagerImpl.java → zhywpt-service-ats/src/main/java/cn/com/taiji/ats/manager/bill/BillReversalManagerImpl.java

@@ -1,35 +1,28 @@
-package cn.com.taiji.ods.manager.bill;
+package cn.com.taiji.ats.manager.bill;
 
+import cn.com.taiji.ats.model.bill.HltResponse;
 import cn.com.taiji.common.manager.AbstractManager;
 import cn.com.taiji.common.manager.net.http.ServiceHandleException;
 import cn.com.taiji.common.pub.json.JsonTools;
-import cn.com.taiji.core.entity.log.LogBillInterface;
-import cn.com.taiji.core.manager.comm.LogManager;
-import cn.com.taiji.core.model.comm.protocol.ods.bill.BillCommResponse;
-import cn.com.taiji.core.model.comm.protocol.ods.bill.BillReversalRequest;
-import cn.com.taiji.core.repo.jpa.log.LogBillInterfaceRepo;
-import cn.com.taiji.ods.model.bill.HltResponse;
+import cn.com.taiji.core.model.comm.protocol.ats.bill.BillCommResponse;
+import cn.com.taiji.core.model.comm.protocol.ats.bill.BillReversalRequest;
+import cn.com.taiji.core.model.comm.protocol.valid.GlyServiceError;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.client.HttpClientErrorException;
 import org.springframework.web.client.HttpServerErrorException;
 
 import java.io.IOException;
 
 @Service
-public class BillReversalManagerImpl extends AbstractManager
-        implements BillReversalManager, LogManager<BillReversalRequest, BillCommResponse, LogBillInterface> {
+public class BillReversalManagerImpl extends AbstractManager implements BillReversalManager{
     Logger logger = LoggerFactory.getLogger(BillReversalManagerImpl.class);
 
     @Autowired
     private HltService hltService;
 
-    @Autowired
-    private LogBillInterfaceRepo logRepo;
-
     @Override
     public BillCommResponse serviceHandle(BillReversalRequest request) throws ServiceHandleException {
 
@@ -41,31 +34,23 @@ public class BillReversalManagerImpl extends AbstractManager
 
             if ("0000".equals(response.getRespCode())) {
                 try {
-                    BillCommResponse commResponse = JsonTools.json2Object(response.getData(), BillCommResponse.class);
-                    return onSuccess(request, commResponse, LogBillInterface.class, System.currentTimeMillis() - begin);
+                    return JsonTools.json2Object(response.getData(), BillCommResponse.class);
                 } catch (IOException e) {
                     logger.error("汇联通响应解析异常: {}", e.getMessage(), e);
-                    throw exception(request, LogBillInterface.class, "接口错误：汇联通接口返回值格式错误！");
+                    throw GlyServiceError.BUSINESS_VALIDATE_ERR.toHandleException( "接口错误：汇联通接口返回值格式错误！");
                 }
             } else {
                 logger.error("汇联通响应异常，状态码: {}, 错误信息: {}", response.getRespCode(), response.getRespMessage());
-                throw exception(request, LogBillInterface.class,
+                throw GlyServiceError.BUSINESS_VALIDATE_ERR.toHandleException(
                         String.format("接口错误：汇联通响应异常！状态码：%s，错误信息：%s", response.getRespCode(), response.getRespMessage()));
             }
         } catch (HttpClientErrorException | HttpServerErrorException e) {
             logger.error("HTTP请求异常，状态码: {}, 错误信息: {}", e.getStatusCode(), e.getResponseBodyAsString(), e);
-            throw exception(request, LogBillInterface.class,
+            throw GlyServiceError.BUSINESS_VALIDATE_ERR.toHandleException(
                     String.format("接口错误：HTTP请求异常！状态码：%s，错误信息：%s", e.getStatusCode(), e.getResponseBodyAsString()));
         } catch (Exception e) {
             logger.error("请求汇联通异常: {}", e.getMessage(), e);
-            throw exception(request, LogBillInterface.class, "接口错误：请求汇联通异常！");
+            throw GlyServiceError.BUSINESS_VALIDATE_ERR.toHandleException( "接口错误：请求汇联通异常！");
         }
     }
-
-    @Override
-    @Transactional
-    public void doSaveLog(BillReversalRequest request, BillCommResponse response, LogBillInterface log) {
-        logger.info("enter do save log");
-        logRepo.persist(log);
-    }
 }

zhywpt-service-ods/src/main/java/cn/com/taiji/ods/manager/bill/HltService.java → zhywpt-service-ats/src/main/java/cn/com/taiji/ats/manager/bill/HltService.java

@@ -1,6 +1,7 @@
-package cn.com.taiji.ods.manager.bill;
+package cn.com.taiji.ats.manager.bill;
 
-import cn.com.taiji.ods.model.bill.HltResponse;
+
+import cn.com.taiji.ats.model.bill.HltResponse;
 
 public interface HltService {
     /**

zhywpt-service-ods/src/main/java/cn/com/taiji/ods/manager/bill/HltServiceImpl.java → zhywpt-service-ats/src/main/java/cn/com/taiji/ats/manager/bill/HltServiceImpl.java

@@ -1,10 +1,10 @@
-package cn.com.taiji.ods.manager.bill;
+package cn.com.taiji.ats.manager.bill;
 
 import cn.com.taiji.common.pub.json.JsonTools;
 import cn.com.taiji.core.manager.tools.http.HttpClientUtil;
-import cn.com.taiji.ods.model.bill.HltRequest;
-import cn.com.taiji.ods.model.bill.HltResponse;
-import cn.com.taiji.ods.tools.DesUtil;
+import cn.com.taiji.ats.model.bill.HltRequest;
+import cn.com.taiji.ats.model.bill.HltResponse;
+import cn.com.taiji.ats.tools.DesUtil;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
 

zhywpt-service-ods/src/main/java/cn/com/taiji/ods/manager/handler/BillOpenServiceHandler.java → zhywpt-service-ats/src/main/java/cn/com/taiji/ats/manager/handler/BillOpenServiceHandler.java

@@ -1,26 +1,26 @@
-package cn.com.taiji.ods.manager.handler;
+package cn.com.taiji.ats.manager.handler;
 
 import cn.com.taiji.common.manager.net.http.ServiceHandleException;
 import cn.com.taiji.common.model.file.FileProtocolSystemError;
 import cn.com.taiji.core.model.comm.protocol.AbstractSignTypeRequest;
 import cn.com.taiji.core.model.comm.protocol.AbstractSignTypeResponse;
 import cn.com.taiji.core.model.comm.protocol.SignJsonRequest;
-import cn.com.taiji.core.model.comm.protocol.ods.OdsServiceType;
-import cn.com.taiji.core.model.comm.protocol.ods.bill.BillOpenCmd;
-import cn.com.taiji.core.model.comm.protocol.ods.bill.BillOpenRequest;
-import cn.com.taiji.core.model.comm.protocol.ods.bill.BillOrderPushLogRequest;
-import cn.com.taiji.core.model.comm.protocol.ods.bill.BillReversalRequest;
-import cn.com.taiji.ods.manager.bill.BillOpenManager;
-import cn.com.taiji.ods.manager.bill.BillOrderPushManager;
-import cn.com.taiji.ods.manager.bill.BillReversalManager;
+import cn.com.taiji.core.model.comm.protocol.ats.AtsServiceType;
+import cn.com.taiji.core.model.comm.protocol.ats.bill.BillOpenCmd;
+import cn.com.taiji.core.model.comm.protocol.ats.bill.BillOpenRequest;
+import cn.com.taiji.core.model.comm.protocol.ats.bill.BillOrderPushLogRequest;
+import cn.com.taiji.core.model.comm.protocol.ats.bill.BillReversalRequest;
+import cn.com.taiji.ats.manager.bill.BillOpenManager;
+import cn.com.taiji.ats.manager.bill.BillOrderPushManager;
+import cn.com.taiji.ats.manager.bill.BillReversalManager;
 import com.zgglyun.common.model.AbstractHttpRequestInfo;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 @Service
-public class BillOpenServiceHandler extends AbstractOdsServiceHandler<BillOpenCmd>{
+public class BillOpenServiceHandler extends AbstractAtsServiceHandler<BillOpenCmd>{
     public BillOpenServiceHandler() {
-        super(OdsServiceType.BILL);
+        super(AtsServiceType.BILL);
     }
 
     @Autowired

zhywpt-service-ods/src/main/java/cn/com/taiji/ods/model/bill/HltRequest.java → zhywpt-service-ats/src/main/java/cn/com/taiji/ats/model/bill/HltRequest.java

@@ -1,8 +1,8 @@
-package cn.com.taiji.ods.model.bill;
+package cn.com.taiji.ats.model.bill;
 
+import cn.com.taiji.ats.tools.HttpConstants;
+import cn.com.taiji.ats.tools.MD5SignUtil;
 import cn.com.taiji.common.model.BaseModel;
-import cn.com.taiji.ods.tools.HttpConstants;
-import cn.com.taiji.ods.tools.MD5SignUtil;
 
 
 /**

zhywpt-service-ods/src/main/java/cn/com/taiji/ods/model/bill/HltResponse.java → zhywpt-service-ats/src/main/java/cn/com/taiji/ats/model/bill/HltResponse.java

@@ -1,4 +1,4 @@
-package cn.com.taiji.ods.model.bill;
+package cn.com.taiji.ats.model.bill;
 
 import cn.com.taiji.common.model.BaseModel;
 

zhywpt-service-ods/src/main/java/cn/com/taiji/ods/tools/DesUtil.java → zhywpt-service-ats/src/main/java/cn/com/taiji/ats/tools/DesUtil.java

@@ -1,4 +1,4 @@
-package cn.com.taiji.ods.tools;
+package cn.com.taiji.ats.tools;
 
 import org.apache.commons.codec.binary.Base64;
 

zhywpt-service-ods/src/main/java/cn/com/taiji/ods/tools/HttpConstants.java → zhywpt-service-ats/src/main/java/cn/com/taiji/ats/tools/HttpConstants.java

@@ -1,4 +1,4 @@
-package cn.com.taiji.ods.tools;
+package cn.com.taiji.ats.tools;
 
 import java.net.HttpURLConnection;
 

zhywpt-service-ods/src/main/java/cn/com/taiji/ods/tools/MD5SignUtil.java → zhywpt-service-ats/src/main/java/cn/com/taiji/ats/tools/MD5SignUtil.java

@@ -1,4 +1,4 @@
-package cn.com.taiji.ods.tools;
+package cn.com.taiji.ats.tools;
 
 import java.security.MessageDigest;
 

zhywpt-service-ats/src/main/resources/bootstrap.yml

@@ -54,3 +54,16 @@ app:
       sample: http://127.0.0.1:8087
       #自测使用
       ats: http://127.0.0.1:8087
+
+# 汇联通相关配置
+hlt:
+  #  url: http://hltgz.com:4010/invoiceManage/batchOpenInvoice
+  url: http://hltgz.com:4010/hltStandardapiPlus
+  #  url: http://100.64.2.99:8099/hltStandardapiPlus
+  appId: ifzt
+  signCode: 6D532026
+  accessCode: E90D91AD8B574273840CC4C4CC869082
+
+# 申办/售后服务订单通知
+orderNotice:
+  url: http://192.168.101.70:8080/orderNotice/v1/activeNotice.json

zhywpt-service-ods/src/main/java/cn/com/taiji/ods/manager/MyCommHandleManager.java

@@ -5,7 +5,6 @@ import javax.annotation.PostConstruct;
 import cn.com.taiji.core.model.comm.protocol.SignServiceType;
 import cn.com.taiji.core.model.comm.protocol.ods.OdsServiceSystem;
 import cn.com.taiji.core.model.comm.protocol.ods.OdsServiceType;
-import cn.com.taiji.ods.manager.handler.BillOpenServiceHandler;
 import cn.com.taiji.ods.manager.handler.OisAssServiceHandler;
 import cn.com.taiji.ods.manager.handler.OisIssueServiceHandler;
 import cn.com.taiji.ods.manager.handler.OqsIssueServiceHandler;
@@ -30,8 +29,6 @@ public class MyCommHandleManager extends AbstractCommHandleManager {
     private OisIssueServiceHandler oisIssueServiceHandler;
     @Autowired
     private OisAssServiceHandler oisAssServiceHandler;
-    @Autowired
-    private BillOpenServiceHandler billOpenServiceHandler;
 
 
     public MyCommHandleManager() {
@@ -43,7 +40,6 @@ public class MyCommHandleManager extends AbstractCommHandleManager {
         registerJsonService(oqsIssueServiceHandler);
         registerJsonService(oisIssueServiceHandler);
         registerJsonService(oisAssServiceHandler);
-        registerJsonService(billOpenServiceHandler);
     }
 
     @Override

zhywpt-service-ods/src/main/java/cn/com/taiji/ods/manager/bill/BillOrderPushManagerImpl.java

@@ -1,60 +0,0 @@
-package cn.com.taiji.ods.manager.bill;
-
-import cn.com.taiji.common.manager.AbstractManager;
-import cn.com.taiji.common.manager.net.http.ServiceHandleException;
-import cn.com.taiji.common.pub.json.JsonTools;
-import cn.com.taiji.core.entity.log.LogBillInterface;
-import cn.com.taiji.core.manager.comm.LogManager;
-import cn.com.taiji.core.manager.tools.http.HttpClientUtil;
-import cn.com.taiji.core.model.comm.protocol.ods.bill.BillOrderPushLogRequest;
-import cn.com.taiji.core.model.comm.protocol.ods.bill.BillOrderPushLogResponse;
-import cn.com.taiji.core.repo.jpa.log.LogBillInterfaceRepo;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Value;
-import org.springframework.stereotype.Service;
-
-import java.io.IOException;
-
-@Service
-public class BillOrderPushManagerImpl extends AbstractManager
-        implements BillOrderPushManager, LogManager<BillOrderPushLogRequest, BillOrderPushLogResponse, LogBillInterface> {
-
-    @Value("${orderNotice.url}")
-    private String orderNoticeUrl;
-
-    @Autowired
-    private LogBillInterfaceRepo logRepo;
-
-    @Override
-    public BillOrderPushLogResponse serviceHandle(BillOrderPushLogRequest request) throws ServiceHandleException {
-        logger.info("请求发票订单请求参数:{}", request);
-        long begin = System.currentTimeMillis();
-        String response = null;
-        try {
-            response = HttpClientUtil.sendPost(orderNoticeUrl, request.toJson(), null);
-        } catch (IOException e) {
-            e.printStackTrace();
-            throw exception(request, LogBillInterface.class, "接口错误：发票订单补推响应异常！");
-        }
-        logger.info("请求发票订单响应参数:{}", response);
-        if (hasText(response)) {
-            try {
-                BillOrderPushLogResponse pushLogResponse = JsonTools.json2Object(response, BillOrderPushLogResponse.class);
-                return onSuccess(request, pushLogResponse, LogBillInterface.class, System.currentTimeMillis() - begin);
-            } catch (IOException e) {
-                logger.error("发票订单补推响应异常:{}", e.getMessage(), e);
-                throw exception(request, LogBillInterface.class, "接口错误：发票订单补推响应异常！");
-            }
-
-        } else {
-            logger.error("发票订单补推响应异常");
-            throw exception(request, LogBillInterface.class, "接口错误：发票订单补推响应异常！");
-        }
-    }
-
-    @Override
-    public void doSaveLog(BillOrderPushLogRequest request, BillOrderPushLogResponse response, LogBillInterface log) {
-        logger.info("enter do save log");
-        logRepo.persist(log);
-    }
-}

zhywpt-service-ods/src/main/resources/bootstrap.yml

@@ -50,30 +50,4 @@ app:
   comm:
     #    自定义服务地址map，key为服务名、value为服务地址。如果配置了服务地址，接口调用时请求到该地址，如果没配置，默认请求到gateway
     serviceAddr:
-      sample: http://127.0.0.1:8086
-
-# 汇联通相关配置
-hlt:
-#  url: http://hltgz.com:4010/invoiceManage/batchOpenInvoice
-  url: http://hltgz.com:4010/hltStandardapiPlus
-#  url: http://100.64.2.99:8099/hltStandardapiPlus
-  appId: ifzt
-  signCode: 6D532026
-  accessCode: E90D91AD8B574273840CC4C4CC869082
-
-# 申办/售后服务订单通知
-orderNotice:
-  url: http://192.168.101.70:8080/orderNotice/v1/activeNotice.json
-
-# 汇联通相关配置
-hlt:
-#  url: http://hltgz.com:4010/invoiceManage/batchOpenInvoice
-  url: http://hltgz.com:4010/hltStandardapiPlus
-#  url: http://100.64.2.99:8099/hltStandardapiPlus
-  appId: ifzt
-  signCode: 6D532026
-  accessCode: E90D91AD8B574273840CC4C4CC869082
-
-# 申办/售后服务订单通知
-orderNotice:
-  url: http://192.168.101.70:8080/orderNotice/v1/activeNotice.json
+      sample: http://127.0.0.1:8086