From b12ec9ab520f604ff5603a4308159ecdd28ec643 Mon Sep 17 00:00:00 2001
From: wb2476 <wb2476@czcb.com.cn>
Date: Wed, 9 Oct 2024 14:15:01 +0800
Subject: [PATCH] =?UTF-8?q?feat=EF=BC=9A=E9=98=A1=E9=99=8C=E5=8F=91?=
 =?UTF-8?q?=E7=A5=A8=E6=9F=A5=E8=AF=A2=E6=8E=A5=E5=8F=A3=E6=B7=BB=E5=8A=A0?=
 =?UTF-8?q?=E5=AD=97=E6=AE=B5=EF=BC=88=E5=8C=B9=E9=85=8D=E7=8A=B6=E6=80=81?=
 =?UTF-8?q?=E7=AD=89=EF=BC=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../model/InvoiceInfoQueryRequest.java        | 26 +++++++++++++++++++
 .../v2/invoice/InvoiceServiceTest.java        |  8 ++++++
 2 files changed, 34 insertions(+)

diff --git a/scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/invoice/model/InvoiceInfoQueryRequest.java b/scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/invoice/model/InvoiceInfoQueryRequest.java
index d20acb9..ddbb35f 100644
--- a/scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/invoice/model/InvoiceInfoQueryRequest.java
+++ b/scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/invoice/model/InvoiceInfoQueryRequest.java
@@ -6,6 +6,8 @@ import com.google.gson.annotations.SerializedName;
 import lombok.Data;
 import lombok.experimental.Accessors;
 
+import java.math.BigDecimal;
+
 /**
  * 231909-发票查询
  *
@@ -77,6 +79,30 @@ public class InvoiceInfoQueryRequest implements PageApiRequest {
     @SerializedName("create_time_end")
     private String createTimeEnd;
 
+    /**
+     * 发票状态  0、生效 1、作废
+     */
+    @SerializedName("invoice_status")
+    private String invoiceStatus;
+
+    /**
+     * 匹配状态 0、未匹配 1、已匹配 2、部分匹配
+     */
+    @SerializedName("match_status")
+    private String matchStatus;
+
+    /**
+     * 结算状态 0、未结算 1、已结算 2、部分结算
+     */
+    @SerializedName("settle_status")
+    private String settleStatus;
+
+    /**
+     * 发票金额
+     */
+    @SerializedName("invoice_amount")
+    private BigDecimal invoiceAmount;
+
     /**
      * 收款账户账号
      */
diff --git a/scfs-api-service/src/test/java/com/czcb/scfs/api/service/v2/invoice/InvoiceServiceTest.java b/scfs-api-service/src/test/java/com/czcb/scfs/api/service/v2/invoice/InvoiceServiceTest.java
index cddfcb8..d0685ee 100644
--- a/scfs-api-service/src/test/java/com/czcb/scfs/api/service/v2/invoice/InvoiceServiceTest.java
+++ b/scfs-api-service/src/test/java/com/czcb/scfs/api/service/v2/invoice/InvoiceServiceTest.java
@@ -159,6 +159,10 @@ class InvoiceServiceTest {
         request.setInvoiceRegisterDateStart("setInvoiceRegisterDateStart");
         request.setCreateTimeStart("setCreateTimeStart");
         request.setCreateTimeEnd("setCreateTimeEnd");
+        request.setInvoiceStatus("setInvoiceStatus");
+        request.setMatchStatus("setMatchStatus");
+        request.setSettleStatus("setSettleStatus");
+        request.setInvoiceAmount(BigDecimal.valueOf(100.00));
     }
 
     void extractedInvoiceInfoQueryRequestAssertions(InvoiceInfoQueryRequest request) {
@@ -178,6 +182,10 @@ class InvoiceServiceTest {
         Assertions.assertEquals("setInvoiceRegisterDateStart", request.getInvoiceRegisterDateStart());
         Assertions.assertEquals("setCreateTimeStart", request.getCreateTimeStart());
         Assertions.assertEquals("setCreateTimeEnd", request.getCreateTimeEnd());
+        Assertions.assertEquals("setInvoiceStatus", request.getInvoiceStatus());
+        Assertions.assertEquals("setMatchStatus", request.getMatchStatus());
+        Assertions.assertEquals("setSettleStatus", request.getSettleStatus());
+        Assertions.assertEquals(BigDecimal.valueOf(100.00), request.getInvoiceAmount());
     }
 
     void extractedInvoiceInfoQueryResponseParams(InvoiceInfoQueryResponse response) {