From 1ae88d17496f75600b6869e74fc6f203cedae17b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=B7=AF=E6=98=8E=E6=85=A7?= <1191093413@qq.com>
Date: Wed, 30 Oct 2024 14:59:14 +0800
Subject: [PATCH] =?UTF-8?q?feature:=E5=89=8D=E6=B5=AA=E6=BD=AE=E6=9F=A5?=
 =?UTF-8?q?=E8=AF=A2=E7=BA=A2=E7=A5=A8=E5=92=8C=E6=9F=A5=E8=AF=A2=E5=8D=95?=
 =?UTF-8?q?=E4=B8=AA=E7=BA=A2=E5=AD=97=E7=A1=AE=E8=AE=A4=E5=8D=95=E6=B7=BB?=
 =?UTF-8?q?=E5=8A=A0=E9=83=A8=E5=88=86=E7=BA=A2=E5=AD=97=E4=BF=A1=E6=81=AF?=
 =?UTF-8?q?=E8=BF=94=E5=9B=9E?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../api/ElephantInvoiceApiV6ServiceImpl.java  | 21 ++++++++++++++++++-
 1 file changed, 20 insertions(+), 1 deletion(-)

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 ea5221b..220030e 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
@@ -2845,6 +2845,7 @@ public class ElephantInvoiceApiV6ServiceImpl implements IInvoiceApiService {
             HXResponse hxResponse = queryInvoice(queryBillInfoDTO, companyservice);
 
             if (StringUtils.equals("0000", hxResponse.getCode())) {
+                addHzxxToRespon(hxResponse, allApiLog);
                 return hxResponse;
             }
 
@@ -2855,7 +2856,7 @@ public class ElephantInvoiceApiV6ServiceImpl implements IInvoiceApiService {
             Invoice invoice = invoiceMapper.selectOne(queryWrapper);
 
             response.put("data", invoice);
-
+            addHzxxToRespon(response, allApiLog);
             return response;
 
         } else if (WebServiceConstant.ADD_RED_INVOICE_QRD.equals(finalServiceId)) {
@@ -2877,6 +2878,7 @@ public class ElephantInvoiceApiV6ServiceImpl implements IInvoiceApiService {
 
             HXResponse hxResponse = parseResult(dxhyInterfaceResponse);
             hxResponse = parseDxhyRes(hxResponse, companyservice);
+            addHzxxToRespon(hxResponse, allApiLog);
             return hxResponse;
 
         } else if (WebServiceConstant.CXHZFPXXQRD.equals(finalServiceId)) {
@@ -2936,6 +2938,23 @@ public class ElephantInvoiceApiV6ServiceImpl implements IInvoiceApiService {
 
     }
 
+    private void addHzxxToRespon(HXResponse hxResponse, InvoiceAllApiLog allApiLog) {
+        try {
+            if (StringUtils.isNotBlank(allApiLog.getResultMsg()) && ObjectUtils.isNotEmpty(hxResponse.getData())) {
+                log.info("表中记录结果信息为：{}",allApiLog.getResultMsg());
+                JSONObject data = JSON.parseObject(JSON.toJSONString(hxResponse.getData()));
+                JSONObject result = JSON.parseObject(allApiLog.getResultMsg());
+                for (String key : result.keySet()) {
+                    data.put(key, result.get(key));
+                }
+                log.info("添加后数据后data：{}",data);
+                hxResponse.put("data",data);
+            }
+        }catch (Exception e){
+            log.error("【销项发票】查询红字单和发票添加红字信息异常",e);
+        }
+    }
+
     /**
      * 转换大象返回报文为简税报文
      */