From 6460d3e4c756aa1748e8a9986251d42104d81451 Mon Sep 17 00:00:00 2001
From: dongxiaoke <1910333201@qq.com>
Date: Tue, 28 May 2024 10:48:58 +0800
Subject: [PATCH] =?UTF-8?q?feature:=20=E9=87=8D=E6=B1=BD=E5=9B=BD=E9=99=85?=
 =?UTF-8?q?=E8=BF=94=E5=9B=9E=E5=80=BC=E7=BB=99=E7=89=B9=E6=AE=8A=E5=A4=84?=
 =?UTF-8?q?=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/api/ElephantInvoiceApiV6ServiceImpl.java     | 4 ++++
 .../java/com/jianshui/invoice/utils/BillDetailFormatUtil.java | 4 ++--
 2 files changed, 6 insertions(+), 2 deletions(-)

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 995a908..790f133 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
@@ -3041,6 +3041,10 @@ public class ElephantInvoiceApiV6ServiceImpl implements IInvoiceApiService {
         }
 
         try {
+            // 重汽国际不判断null值，给特殊处理下
+            if(StrUtil.isEmpty(invoice.getInvoiceResultMsg())){
+               invoice.setInvoiceResultMsg("");
+            }
 
             log.info("【控制台】发票回调接口，发送数据开始，id={}，callBackUrl={}，param={}", id, callBackUrl, JSONUtil.toJsonStr(invoice));
             String result = HttpUtil.post(callBackUrl, JSONUtil.toJsonStr(invoice));
diff --git a/jianshui-invoice/src/main/java/com/jianshui/invoice/utils/BillDetailFormatUtil.java b/jianshui-invoice/src/main/java/com/jianshui/invoice/utils/BillDetailFormatUtil.java
index f553028..3352f4c 100644
--- a/jianshui-invoice/src/main/java/com/jianshui/invoice/utils/BillDetailFormatUtil.java
+++ b/jianshui-invoice/src/main/java/com/jianshui/invoice/utils/BillDetailFormatUtil.java
@@ -392,8 +392,8 @@ public class BillDetailFormatUtil {
                         return AjaxResult.error("明细行含税金额使用公式计算出的税额与传入含税金额减去不含税金额（不含税单价、数量积）计算出的税额差额大于6分钱", billDetail);
                     }
                     billDetail.setTaxamt(taxAmt);
-//                    billDetail.setTax(tax);
-                    billDetail.setTax(taxs);
+                    billDetail.setTax(tax);
+//                    billDetail.setTax(taxs);
                     billDetail.setTaxfreeamt(taxFreeAmt);
                     return AjaxResult.success(billDetail);
                 }