From 66213780c2ffb93b038e8edf7960b7b939ad4445 Mon Sep 17 00:00:00 2001
From: yefei <yefei@ele-cloud.com>
Date: Tue, 16 May 2023 15:55:15 +0800
Subject: [PATCH] =?UTF-8?q?ariesy=20=E4=BF=AE=E5=A4=8D=E5=85=A8=E7=94=B5?=
 =?UTF-8?q?=E5=8F=91=E7=A5=A8=E6=9F=A5=E9=AA=8C=E5=8F=82=E6=95=B0=E4=BC=A0?=
 =?UTF-8?q?=E8=BE=93=E9=94=99=E8=AF=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/dxhy/core/job/pojo/CheckNoDetailInvoice.java     | 9 ++++++++-
 .../dxhy/core/job/service/impl/CheckTaskServiceImpl.java | 9 ++++++---
 dxhy-core/src/main/resources/mapper/job/CheckTaskDao.xml | 3 ++-
 3 files changed, 16 insertions(+), 5 deletions(-)

diff --git a/dxhy-core/src/main/java/com/dxhy/core/job/pojo/CheckNoDetailInvoice.java b/dxhy-core/src/main/java/com/dxhy/core/job/pojo/CheckNoDetailInvoice.java
index 9bbb30ab..75d1eaf7 100644
--- a/dxhy-core/src/main/java/com/dxhy/core/job/pojo/CheckNoDetailInvoice.java
+++ b/dxhy-core/src/main/java/com/dxhy/core/job/pojo/CheckNoDetailInvoice.java
@@ -44,7 +44,14 @@ public class CheckNoDetailInvoice {
     private String checkCode;
 
     /**
-     * 金额
+     * 不含税金额
      */
     private BigDecimal invoiceAmount;
+
+    /**
+     * 总金额
+     */
+    private BigDecimal totalAmount;
+
+
 }
diff --git a/dxhy-core/src/main/java/com/dxhy/core/job/service/impl/CheckTaskServiceImpl.java b/dxhy-core/src/main/java/com/dxhy/core/job/service/impl/CheckTaskServiceImpl.java
index dbdabbd5..2361d530 100644
--- a/dxhy-core/src/main/java/com/dxhy/core/job/service/impl/CheckTaskServiceImpl.java
+++ b/dxhy-core/src/main/java/com/dxhy/core/job/service/impl/CheckTaskServiceImpl.java
@@ -239,20 +239,23 @@ public class CheckTaskServiceImpl implements CheckTaskService {
             requestData.setInvoiceCode("");
             // 发票号码
             requestData.setInvoiceNo(checkNoDetailInvoice.getInvoiceCode() + checkNoDetailInvoice.getInvoiceNo());
+            // 金额
+            requestData.setInvoiceAmount(checkNoDetailInvoice.getTotalAmount().setScale(2, BigDecimal.ROUND_HALF_UP).toString());
+
         }else {
             // 发票代码
             requestData.setInvoiceCode(checkNoDetailInvoice.getInvoiceCode());
             // 发票号码
             requestData.setInvoiceNo(checkNoDetailInvoice.getInvoiceNo());
+            // 金额
+            requestData.setInvoiceAmount(checkNoDetailInvoice.getInvoiceAmount().setScale(2, BigDecimal.ROUND_HALF_UP).toString());
+
         }
         // 开票时间
         String sdate = (new SimpleDateFormat("yyyyMMdd")).format(checkNoDetailInvoice.getInvoiceDate());
         requestData.setInvoiceDate(sdate);
         // 验证码
         requestData.setCheckCode(checkNoDetailInvoice.getCheckCode());
-        // 金额
-        requestData
-            .setInvoiceAmount(checkNoDetailInvoice.getInvoiceAmount().setScale(2, BigDecimal.ROUND_HALF_UP).toString());
 
         return requestData;
     }
diff --git a/dxhy-core/src/main/resources/mapper/job/CheckTaskDao.xml b/dxhy-core/src/main/resources/mapper/job/CheckTaskDao.xml
index 8e5ce341..627286da 100644
--- a/dxhy-core/src/main/resources/mapper/job/CheckTaskDao.xml
+++ b/dxhy-core/src/main/resources/mapper/job/CheckTaskDao.xml
@@ -38,7 +38,8 @@
                invoice_no,
                invoice_date,
                check_code,
-               invoice_amount
+               invoice_amount,
+               total_amount
         FROM t_dx_record_invoice
         where detail_yesorno = '0'
           and source_system = '0'