From 94e467db2e4025b583f3f8fe85f6a645a09eaa31 Mon Sep 17 00:00:00 2001
From: kk <1910333201@qq.com>
Date: Tue, 12 Dec 2023 11:35:44 +0800
Subject: [PATCH] =?UTF-8?q?=E9=87=8D=E6=B1=BD=20=E7=BA=A2=E5=AD=97?=
 =?UTF-8?q?=E7=94=B3=E8=AF=B7=E8=A1=A8=E4=B8=8B=E8=BD=BD=E5=BC=82=E5=B8=B8?=
 =?UTF-8?q?=E8=BF=94=E5=9B=9E=E5=A4=84=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/jianshui/invoice/domain/dto/HXResponse.java | 6 +++---
 .../api/AisinoConsoleInvoiceApiZhongQiServiceImpl.java   | 9 ++++++---
 .../com/jianshui/invoice/task/AddInvoiceBatchTask.java   | 2 --
 3 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/jianshui-invoice/src/main/java/com/jianshui/invoice/domain/dto/HXResponse.java b/jianshui-invoice/src/main/java/com/jianshui/invoice/domain/dto/HXResponse.java
index 35ed666..b4e8aa9 100644
--- a/jianshui-invoice/src/main/java/com/jianshui/invoice/domain/dto/HXResponse.java
+++ b/jianshui-invoice/src/main/java/com/jianshui/invoice/domain/dto/HXResponse.java
@@ -62,16 +62,16 @@ public class HXResponse extends JSONObject {
         }
     }
 
-    public HXResponse( String status,String msg,Object data,boolean isCode,String a) {
+    public HXResponse( String status,String message,Object data,boolean isCode,String a) {
         if(isCode){
-            this.message = msg;
+            this.message = message;
             this.data = data;
             this.code = status;
             this.put("message", this.message);
             this.put("status", this.code);
             this.put("data", this.data);
         }else{
-            this.message = msg;
+            this.message = message;
             this.code = status;
             this.put("message", this.message);
             this.put("status", this.code);
diff --git a/jianshui-invoice/src/main/java/com/jianshui/invoice/service/impl/api/AisinoConsoleInvoiceApiZhongQiServiceImpl.java b/jianshui-invoice/src/main/java/com/jianshui/invoice/service/impl/api/AisinoConsoleInvoiceApiZhongQiServiceImpl.java
index df860dd..521cc8a 100644
--- a/jianshui-invoice/src/main/java/com/jianshui/invoice/service/impl/api/AisinoConsoleInvoiceApiZhongQiServiceImpl.java
+++ b/jianshui-invoice/src/main/java/com/jianshui/invoice/service/impl/api/AisinoConsoleInvoiceApiZhongQiServiceImpl.java
@@ -944,7 +944,8 @@ public class AisinoConsoleInvoiceApiZhongQiServiceImpl implements IInvoiceApiSer
 
         List<CompanyserviceDetail> companyserviceDetailList = companyservice.getCompanyserviceDetailList();
         if (CollectionUtils.isEmpty(companyserviceDetailList) || StrUtil.isEmpty(companyserviceDetailList.get(0).getGoldenTaxDiskNo())) {
-            throw new JianshuiServiceException("金税盘编号未配置，请联系管理员！");
+//            throw new JianshuiServiceException("金税盘编号未配置，请联系管理员！");
+            return new HXResponse("9999", "金税盘编号未配置，请联系管理员！");
         }
         String goldenTaxDiskNo = companyserviceDetailList.get(0).getGoldenTaxDiskNo();
         String fjh = companyserviceDetailList.get(0).getFjh();
@@ -977,12 +978,14 @@ public class AisinoConsoleInvoiceApiZhongQiServiceImpl implements IInvoiceApiSer
         } catch (Exception e) {
             log.error("【销项发票】【总部控制台接口】【红字申请表下载】发票请求异常，请求报文{}，销方信息{}", "", JSONObject.toJSONString(companyservice));
             e.printStackTrace();
-            throw new JianshuiServiceException("系统异常！");
+//            throw new JianshuiServiceException("系统异常！");
+            return new HXResponse("9999", "系统异常！");
         }
 
         //返回报文解析
         if (ajaxResult.isError()) {
-            throw new JianshuiServiceException(ajaxResult.getMsg());
+//            throw new JianshuiServiceException(ajaxResult.getMsg());
+            return new HXResponse("9999", ajaxResult.getMsg());
         }
 
         /** 控制台和文档不一样*/
diff --git a/jianshui-invoice/src/main/java/com/jianshui/invoice/task/AddInvoiceBatchTask.java b/jianshui-invoice/src/main/java/com/jianshui/invoice/task/AddInvoiceBatchTask.java
index 017c3a2..c650df8 100644
--- a/jianshui-invoice/src/main/java/com/jianshui/invoice/task/AddInvoiceBatchTask.java
+++ b/jianshui-invoice/src/main/java/com/jianshui/invoice/task/AddInvoiceBatchTask.java
@@ -132,8 +132,6 @@ public class AddInvoiceBatchTask extends TimerTask {
 
         // 3-报文递交开票
         for (Object billInfoObj : billJsonArray) {
-            // 睡眠1秒再去提交
-            Thread.sleep(1 * 1000);
 
             // 1-前置条件判断
             InvoiceBack invoiceBack = new InvoiceBack();