From 516b25f5daeb6e38217d4584252314b430690c24 Mon Sep 17 00:00:00 2001
From: kk <1910333201@qq.com>
Date: Thu, 26 Oct 2023 21:46:11 +0800
Subject: [PATCH] =?UTF-8?q?=E7=BA=A2=E5=AD=97=E9=97=AE=E9=A2=98=E6=8E=92?=
 =?UTF-8?q?=E6=9F=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../AisinoConsoleInvoiceRedDownloadDTO.java        |  3 +++
 .../request/AisinoInvoiceRequestAdapterImpl.java   |  2 +-
 .../AisinoConsoleInvoiceApiZhongQiServiceImpl.java | 14 ++++++++++----
 3 files changed, 14 insertions(+), 5 deletions(-)

diff --git a/jianshui-invoice/src/main/java/com/jianshui/invoice/domain/dto/api/aisino/console/AisinoConsoleInvoiceRedDownloadDTO.java b/jianshui-invoice/src/main/java/com/jianshui/invoice/domain/dto/api/aisino/console/AisinoConsoleInvoiceRedDownloadDTO.java
index d97b7c7..56f9681 100644
--- a/jianshui-invoice/src/main/java/com/jianshui/invoice/domain/dto/api/aisino/console/AisinoConsoleInvoiceRedDownloadDTO.java
+++ b/jianshui-invoice/src/main/java/com/jianshui/invoice/domain/dto/api/aisino/console/AisinoConsoleInvoiceRedDownloadDTO.java
@@ -32,9 +32,11 @@ public class AisinoConsoleInvoiceRedDownloadDTO {
     @ApiModelProperty(value = "逾期状态")
     private String YQZT;
 
+    @Alias("billTimeBegin")
     @ApiModelProperty(value = "填开日期")
     private String TKRQ_Q;
 
+    @Alias("billTimeEnd")
     @ApiModelProperty(value = "填开日期")
     private String TKRQ_Z;
 
@@ -44,6 +46,7 @@ public class AisinoConsoleInvoiceRedDownloadDTO {
     @ApiModelProperty(value = "销方税号")
     private String XFSH;
 
+    @Alias("billInfoNo")
     @ApiModelProperty(value = "信息表编号")
     private String XXBBH;
 
diff --git a/jianshui-invoice/src/main/java/com/jianshui/invoice/service/impl/adapter/request/AisinoInvoiceRequestAdapterImpl.java b/jianshui-invoice/src/main/java/com/jianshui/invoice/service/impl/adapter/request/AisinoInvoiceRequestAdapterImpl.java
index 544d46f..20b002a 100644
--- a/jianshui-invoice/src/main/java/com/jianshui/invoice/service/impl/adapter/request/AisinoInvoiceRequestAdapterImpl.java
+++ b/jianshui-invoice/src/main/java/com/jianshui/invoice/service/impl/adapter/request/AisinoInvoiceRequestAdapterImpl.java
@@ -104,7 +104,7 @@ public class AisinoInvoiceRequestAdapterImpl implements IInvoiceRequestService {
         try {
             // TODO: 2023/9/20
 
-            order = AisinoInvoiceDecryptUtil.decrypt(order, JKey);
+//            order = AisinoInvoiceDecryptUtil.decrypt(order, JKey);
         } catch (Exception e) {
             e.printStackTrace();
             throw new JianshuiParamErrorException(ErrorCode.DECRYPT_ERROR, companyservice, "invoice");
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 7aea75a..6ef492d 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
@@ -264,6 +264,14 @@ public class AisinoConsoleInvoiceApiZhongQiServiceImpl implements IInvoiceApiSer
         // 发起请求
         AjaxResult ajaxResult = null;
         try {
+            // 控制台文档给的不对，反了
+            String jdcbz = aisinoConsoleInvoiceAddDTO.getJDCBZ() != null ? aisinoConsoleInvoiceAddDTO.getJDCBZ() : "";
+            if("1".equals(jdcbz)){
+                aisinoConsoleInvoiceAddDTO.setJDCBZ("2");
+            }else if("2".equals(jdcbz)){
+                aisinoConsoleInvoiceAddDTO.setJDCBZ("1");
+            }
+
             //hutool的beancopy别名会与JSONUTIl冲突
             Map<String, Object> map = BeanToMapUtils.fastJsonBean2Map(aisinoConsoleInvoiceAddDTO);
             map.put("invoiceItems", listMap);
@@ -848,14 +856,12 @@ public class AisinoConsoleInvoiceApiZhongQiServiceImpl implements IInvoiceApiSer
         downloadDTO.setNSRSBH(companyservice.getSellertax());
         downloadDTO.setSBBH(goldenTaxDiskNo);
 
-
-        // TODO: 2023/10/25 这里改为空的属性也传
-
         String param = JSONUtil.toXmlStr(JSONUtil.parse(downloadDTO));
 
         param = "<?xml version=\"1.0\" encoding=\"GBK\"?>\n" +
                 "<FPXT>\n" +
-                "    <INPUT>\n" + param + "</INPUT>\n" +
+                "<INPUT>\n" +
+                "" + param + "</INPUT>" +
                 "</FPXT>";