From d1c71e97606acab9b8518f3f783b19eb1982477f Mon Sep 17 00:00:00 2001
From: kk <1910333201@qq.com>
Date: Fri, 12 Jan 2024 14:45:39 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8F=91=E7=A5=A8=E6=89=93=E5=8D=B0V5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../invoice/domain/dto/PrintDetailDTO.java     |  2 ++
 .../api/ElephantInvoiceApiV6ServiceImpl.java   | 18 ++++++++++++++----
 2 files changed, 16 insertions(+), 4 deletions(-)

diff --git a/jianshui-invoice/src/main/java/com/jianshui/invoice/domain/dto/PrintDetailDTO.java b/jianshui-invoice/src/main/java/com/jianshui/invoice/domain/dto/PrintDetailDTO.java
index f1980a8..e6b854e 100644
--- a/jianshui-invoice/src/main/java/com/jianshui/invoice/domain/dto/PrintDetailDTO.java
+++ b/jianshui-invoice/src/main/java/com/jianshui/invoice/domain/dto/PrintDetailDTO.java
@@ -20,4 +20,6 @@ public class PrintDetailDTO {
 
     private String fpzh; // 发票止号
 
+    private String fjh; // 分机号
+
 }
diff --git a/jianshui-invoice/src/main/java/com/jianshui/invoice/service/impl/api/ElephantInvoiceApiV6ServiceImpl.java b/jianshui-invoice/src/main/java/com/jianshui/invoice/service/impl/api/ElephantInvoiceApiV6ServiceImpl.java
index 51addfa..7f9ecc6 100644
--- a/jianshui-invoice/src/main/java/com/jianshui/invoice/service/impl/api/ElephantInvoiceApiV6ServiceImpl.java
+++ b/jianshui-invoice/src/main/java/com/jianshui/invoice/service/impl/api/ElephantInvoiceApiV6ServiceImpl.java
@@ -1157,12 +1157,19 @@ public class ElephantInvoiceApiV6ServiceImpl implements IInvoiceApiService {
                 String dataTemp = dataJson.get("DATA") != null ? dataJson.get("DATA").toString() : "";
 
                 if ("000000".equals(ztdm)) {
+                    cn.hutool.json.JSONObject json = null;
                     if (StrUtil.isNotEmpty(dataTemp)) {
-                        return new HXResponse(code, "", JSONUtil.parse(dataTemp), true);
+                        json = JSONUtil.parseObj(dataTemp);
                     } else {
-                        return new HXResponse(code, "", JSONUtil.parse(data), true);
+                        json = JSONUtil.parseObj(data);
                     }
-
+                    // 键值转小写
+                    JSONObject lowerCaseJson = new JSONObject();
+                    json.forEach((key, value) -> {
+                        String lowerCaseKey = key.toLowerCase();
+                        lowerCaseJson.put(lowerCaseKey, value);
+                    });
+                    return new HXResponse(code, "", lowerCaseJson, true);
                 } else {
                     return new HXResponse(ztdm, ztxx, "", true);
                 }
@@ -1174,6 +1181,8 @@ public class ElephantInvoiceApiV6ServiceImpl implements IInvoiceApiService {
         return new HXResponse(code, "接口请求失败！", "", false);
     }
 
+
+
     /**
      * 申请/上传 红字发票
      *
@@ -1689,6 +1698,7 @@ public class ElephantInvoiceApiV6ServiceImpl implements IInvoiceApiService {
                 tempQuery.put("FPDM", temp.getFpdm()); // "发票代码",
                 tempQuery.put("FPQH", temp.getFpqh()); // "发票起号",
                 tempQuery.put("FPZH", temp.getFpzh()); // "发票止号"
+                tempQuery.put("FJH", printDTO.getFjh()); // "分机号"
                 tmepDetails.add(tempQuery);
             }
             query.put("DYFPXX", tmepDetails);
@@ -1696,7 +1706,7 @@ public class ElephantInvoiceApiV6ServiceImpl implements IInvoiceApiService {
 
         AjaxResult queryResult = null;
         try {
-            queryResult = ElephantUtils.sendRequestWithoutToken(ElephantConstantsV6.BATCH_PRINT_LOCALHOST, ElephantConstantsV6.BATCH_PRINT, JSONUtil.parse(query), companyservice);
+            queryResult = ElephantUtils.sendRequestWithoutTokenV6New(ElephantConstantsV6.BATCH_PRINT_LOCALHOST, ElephantConstantsV6.BATCH_PRINT, JSONUtil.parse(query), companyservice);
         } catch (UnsupportedEncodingException | NoSuchAlgorithmException | InvalidKeyException e) {
             log.error("【销项发票】【大象接口】【批量打印V5】发票请求异常，请求报文{}，销方信息{}", JSONUtil.parse(query).toString(), JSONObject.toJSONString(companyservice));
             e.printStackTrace();