From 3960fccfbfab4cb406d96b6764e5095946c0e13d Mon Sep 17 00:00:00 2001
From: dongxiaoke <1910333201@qq.com>
Date: Mon, 27 May 2024 22:24:48 +0800
Subject: [PATCH] =?UTF-8?q?feature:=20=E6=98=8E=E7=BB=86=E8=A1=8C=E6=9F=A5?=
 =?UTF-8?q?=E8=AF=A2=E9=97=AE=E9=A2=98=E5=A4=84=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/jianshui/invoice/mapper/InvoiceMapper.java     |  2 ++
 .../com/jianshui/invoice/task/InvoiceBackTask.java     | 10 +++++++++-
 .../main/resources/mapper/invoice/InvoiceMapper.xml    |  3 +++
 3 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/jianshui-invoice/src/main/java/com/jianshui/invoice/mapper/InvoiceMapper.java b/jianshui-invoice/src/main/java/com/jianshui/invoice/mapper/InvoiceMapper.java
index 2dbb3c2..5ddd92f 100644
--- a/jianshui-invoice/src/main/java/com/jianshui/invoice/mapper/InvoiceMapper.java
+++ b/jianshui-invoice/src/main/java/com/jianshui/invoice/mapper/InvoiceMapper.java
@@ -120,4 +120,6 @@ public interface InvoiceMapper extends BaseMapper<Invoice> {
     public Invoice selectByFpdmFphm(@Param(("companyId")) Long companyId, @Param("fpdm") String fpdm, @Param("fphm") String fphm);
 
     public Invoice selectInvoiceByBillInfoId(Long id);
+
+    List<InvoiceDetail> selectInvoiceIdForInvoiceDetailList(@Param(("id")) Long id);
 }
diff --git a/jianshui-invoice/src/main/java/com/jianshui/invoice/task/InvoiceBackTask.java b/jianshui-invoice/src/main/java/com/jianshui/invoice/task/InvoiceBackTask.java
index 8f0be70..d3232a5 100644
--- a/jianshui-invoice/src/main/java/com/jianshui/invoice/task/InvoiceBackTask.java
+++ b/jianshui-invoice/src/main/java/com/jianshui/invoice/task/InvoiceBackTask.java
@@ -14,6 +14,7 @@ import com.jianshui.common.utils.spring.SpringUtils;
 import com.jianshui.invoice.constant.aisino.console.AisinoConsoleConstants;
 import com.jianshui.invoice.domain.Invoice;
 import com.jianshui.invoice.domain.InvoiceBack;
+import com.jianshui.invoice.domain.InvoiceDetail;
 import com.jianshui.invoice.domain.Redinfo;
 import com.jianshui.invoice.domain.dto.ExportVehicleDTO;
 import com.jianshui.invoice.domain.dto.HXResponse;
@@ -52,6 +53,8 @@ public class InvoiceBackTask {
     private ICompanyservicePropService propService;
 
 
+
+
     /**
      * @author kk
      * @date 9:03
@@ -257,6 +260,11 @@ public class InvoiceBackTask {
                 invoice.setMessage( (invoiceBack.getResultMsg() != null && invoiceBack.getResultMsg().length() > 200) ? invoiceBack.getResultMsg().substring(0, 200) : invoiceBack.getResultMsg() );
                 continue;
             }
+            // 明细重插
+            List<InvoiceDetail> invoiceDetailList = invoiceMapper.selectInvoiceIdForInvoiceDetailList(invoice.getId());
+            if(!invoiceDetailList.isEmpty()){
+                invoice.setInvoiceDetailList(invoiceDetailList);
+            }
 
             try {
 
@@ -287,7 +295,7 @@ public class InvoiceBackTask {
                     continue;
                 }
             } catch (Exception e) {
-                log.info("【控制台】发票回调接口，发送数据异常，id={}", id);
+                log.info("【控制台】发票回调接口，发送数据异常，id={},e={}", id,e.toString());
                 invoiceBack.setStatus("2");
                 invoiceBack.setBackMsg("发送数据异常");
                 invoiceBack.setUpdateTime(new Date());
diff --git a/jianshui-invoice/src/main/resources/mapper/invoice/InvoiceMapper.xml b/jianshui-invoice/src/main/resources/mapper/invoice/InvoiceMapper.xml
index 87fb18f..912dd55 100644
--- a/jianshui-invoice/src/main/resources/mapper/invoice/InvoiceMapper.xml
+++ b/jianshui-invoice/src/main/resources/mapper/invoice/InvoiceMapper.xml
@@ -494,4 +494,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                  left join invoice_detail b on b.invoice_id = a.id
         where a.bill_info_id = #{id}
     </select>
+    <select id="selectInvoiceIdForInvoiceDetailList" resultType="com.jianshui.invoice.domain.InvoiceDetail">
+        select * from invoice_detail where invoice_id = #{id}
+    </select>
 </mapper>