From 658ac47bf1233b116a3720cd8bfdb9c4214c870c Mon Sep 17 00:00:00 2001 From: wb2476 Date: Wed, 9 Oct 2024 15:01:35 +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=8F=91=E7=A5=A8=E9=87=91=E9=A2=9D?= =?UTF-8?q?=E6=94=B9=E4=B8=BA=E5=8C=BA=E9=97=B4=EF=BC=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../v2/invoice/model/InvoiceInfoQueryRequest.java | 12 +++++++++--- .../api/service/v2/invoice/InvoiceServiceTest.java | 6 ++++-- 2 files changed, 13 insertions(+), 5 deletions(-) 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 ddbb35f..552a184 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 @@ -98,10 +98,16 @@ public class InvoiceInfoQueryRequest implements PageApiRequest { private String settleStatus; /** - * 发票金额 + * 发票金额 开始 */ - @SerializedName("invoice_amount") - private BigDecimal invoiceAmount; + @SerializedName("invoice_amount_start") + private BigDecimal invoiceAmountStart; + + /** + * 发票金额 截至 + */ + @SerializedName("invoice_amount_end") + private BigDecimal invoiceAmountEnd; /** * 收款账户账号 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 d0685ee..213efc3 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 @@ -162,7 +162,8 @@ class InvoiceServiceTest { request.setInvoiceStatus("setInvoiceStatus"); request.setMatchStatus("setMatchStatus"); request.setSettleStatus("setSettleStatus"); - request.setInvoiceAmount(BigDecimal.valueOf(100.00)); + request.setInvoiceAmountStart(BigDecimal.valueOf(100.00)); + request.setInvoiceAmountEnd(BigDecimal.valueOf(100.00)); } void extractedInvoiceInfoQueryRequestAssertions(InvoiceInfoQueryRequest request) { @@ -185,7 +186,8 @@ class InvoiceServiceTest { Assertions.assertEquals("setInvoiceStatus", request.getInvoiceStatus()); Assertions.assertEquals("setMatchStatus", request.getMatchStatus()); Assertions.assertEquals("setSettleStatus", request.getSettleStatus()); - Assertions.assertEquals(BigDecimal.valueOf(100.00), request.getInvoiceAmount()); + Assertions.assertEquals(BigDecimal.valueOf(100.00), request.getInvoiceAmountStart()); + Assertions.assertEquals(BigDecimal.valueOf(100.00), request.getInvoiceAmountEnd()); } void extractedInvoiceInfoQueryResponseParams(InvoiceInfoQueryResponse response) {