From 6b8da80513855e95ab9cd3bcf8ec45815747deb7 Mon Sep 17 00:00:00 2001 From: 13009 Date: Fri, 12 Jul 2024 14:08:47 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E5=8F=91=E7=A5=A8=E6=B5=81=E6=B0=B4?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../equity/invoice/InvoiceService.java | 11 ++ .../invoice/model/InvoiceMatchRequest.java | 52 ++----- .../invoice/model/InvoiceQueryRequest.java | 6 + .../invoice/model/InvoiceQueryResponse.java | 9 ++ .../model/InvoiceTransQueryRequest.java | 58 ++++++++ .../model/InvoiceTransQueryResponse.java | 133 ++++++++++++++++++ .../src/main/resources/application.properties | 6 +- 7 files changed, 232 insertions(+), 43 deletions(-) create mode 100644 scfs-api-service-equity/src/main/java/com/czcb/scfs/service/equity/invoice/model/InvoiceTransQueryRequest.java create mode 100644 scfs-api-service-equity/src/main/java/com/czcb/scfs/service/equity/invoice/model/InvoiceTransQueryResponse.java diff --git a/scfs-api-service-equity/src/main/java/com/czcb/scfs/service/equity/invoice/InvoiceService.java b/scfs-api-service-equity/src/main/java/com/czcb/scfs/service/equity/invoice/InvoiceService.java index 4687073..da114ae 100644 --- a/scfs-api-service-equity/src/main/java/com/czcb/scfs/service/equity/invoice/InvoiceService.java +++ b/scfs-api-service-equity/src/main/java/com/czcb/scfs/service/equity/invoice/InvoiceService.java @@ -73,4 +73,15 @@ public class InvoiceService { HttpResponse httpResponse = apiClient.post(url, headers, request.toJsonRequest(), InvoiceMatchResponse.class); return httpResponse.getServiceResponse(); } + + /** + * 查询流水 + */ + public InvoiceTransQueryResponse transQuery(InvoiceTransQueryRequest request) { + String url = "/invoice/trans/query"; + HttpHeaders headers = new HttpHeaders(); + headers.addHeader(API_VERSION, V_2); + HttpResponse httpResponse = apiClient.post(url, headers, request.toJsonRequest(), InvoiceTransQueryResponse.class); + return httpResponse.getServiceResponse(); + } } diff --git a/scfs-api-service-equity/src/main/java/com/czcb/scfs/service/equity/invoice/model/InvoiceMatchRequest.java b/scfs-api-service-equity/src/main/java/com/czcb/scfs/service/equity/invoice/model/InvoiceMatchRequest.java index 430eb4c..4ba708c 100644 --- a/scfs-api-service-equity/src/main/java/com/czcb/scfs/service/equity/invoice/model/InvoiceMatchRequest.java +++ b/scfs-api-service-equity/src/main/java/com/czcb/scfs/service/equity/invoice/model/InvoiceMatchRequest.java @@ -7,7 +7,6 @@ import lombok.Data; import lombok.experimental.Accessors; import java.math.BigDecimal; -import java.util.Date; /** * @author wangwei @@ -52,16 +51,13 @@ public class InvoiceMatchRequest implements ApiRequest { */ @SerializedName("invoice_no") private String invoiceNo; + /** - * 发票类型 1、通用发票 2、累计循环发票 + * 来账流水号 */ - @SerializedName("invoice_type") - private String invoiceType; - /** - * 发票登记日期 - */ - @SerializedName("invoice_register_date") - private Date invoiceRegisterDate; + @SerializedName("deposit_serial_no") + private String depositSerialNo; + /** * 付款账户账号 */ @@ -73,38 +69,14 @@ public class InvoiceMatchRequest implements ApiRequest { @SerializedName("account_name") private String accountName; /** - * 收款账户账号（入账账户） + * 结算金额 */ - @SerializedName("opp_account_no") - private String oppAccountNo; + @SerializedName("settle_amount") + private BigDecimal settleAmount; + /** - * 收款账户户名（入账账户） + * 匹配类型 */ - @SerializedName("opp_account_name") - private String oppAccountName; - /** - * 归集账户账号（待清算账户/可控电商A2） - */ - @SerializedName("settle_account_no") - private String settleAccountNo; - /** - * 归集账户户名（待清算账户/可控电商A2） - */ - @SerializedName("settle_account_name") - private String settleAccountName; - /** - * 发票归属日期起 - */ - @SerializedName("invoice_belong_start_date") - private Date invoiceBelongStartDate; - /** - * 发票归属日期止 - */ - @SerializedName("invoice_belong_end_date") - private Date invoiceBelongEndDate; - /** - * 发票金额 - */ - @SerializedName("invoice_amount") - private BigDecimal invoiceAmount; + @SerializedName("match_type") + private String matchType; } diff --git a/scfs-api-service-equity/src/main/java/com/czcb/scfs/service/equity/invoice/model/InvoiceQueryRequest.java b/scfs-api-service-equity/src/main/java/com/czcb/scfs/service/equity/invoice/model/InvoiceQueryRequest.java index 1c82a19..0e307a1 100644 --- a/scfs-api-service-equity/src/main/java/com/czcb/scfs/service/equity/invoice/model/InvoiceQueryRequest.java +++ b/scfs-api-service-equity/src/main/java/com/czcb/scfs/service/equity/invoice/model/InvoiceQueryRequest.java @@ -91,4 +91,10 @@ public class InvoiceQueryRequest implements PageApiRequest { */ @SerializedName("settle_account_name") private String settleAccountName; + + @SerializedName("current_page") + private String currentPage; + + @SerializedName("current_rows") + private String currentRows; } diff --git a/scfs-api-service-equity/src/main/java/com/czcb/scfs/service/equity/invoice/model/InvoiceQueryResponse.java b/scfs-api-service-equity/src/main/java/com/czcb/scfs/service/equity/invoice/model/InvoiceQueryResponse.java index f6f98a8..8482290 100644 --- a/scfs-api-service-equity/src/main/java/com/czcb/scfs/service/equity/invoice/model/InvoiceQueryResponse.java +++ b/scfs-api-service-equity/src/main/java/com/czcb/scfs/service/equity/invoice/model/InvoiceQueryResponse.java @@ -48,6 +48,15 @@ public class InvoiceQueryResponse implements PageApiResponse { @SerializedName("data") private List data; + @SerializedName("current_page") + private String currentPage; + + @SerializedName("total_page") + private String totalPage; + + @SerializedName("total_rows") + private String totalRows; + @Data public static class InvoiceData implements Serializable { /** diff --git a/scfs-api-service-equity/src/main/java/com/czcb/scfs/service/equity/invoice/model/InvoiceTransQueryRequest.java b/scfs-api-service-equity/src/main/java/com/czcb/scfs/service/equity/invoice/model/InvoiceTransQueryRequest.java new file mode 100644 index 0000000..62e722b --- /dev/null +++ b/scfs-api-service-equity/src/main/java/com/czcb/scfs/service/equity/invoice/model/InvoiceTransQueryRequest.java @@ -0,0 +1,58 @@ +package com.czcb.scfs.service.equity.invoice.model; + +import com.czcb.scfs.api.core.PageApiRequest; +import com.czcb.scfs.api.core.agrs.TransType; +import com.google.gson.annotations.SerializedName; +import lombok.Data; +import lombok.experimental.Accessors; + +/** + * @author wangwei + * @since 2024/7/8 + */ +@Data +@Accessors(chain = true) +@TransType("243303") +public class InvoiceTransQueryRequest implements PageApiRequest { + /** + * 渠道编号 + */ + @SerializedName("channel_no") + private String channelNo; + + /** + * 应用编号 + */ + @SerializedName("app_no") + private String appNo; + + /** + * 流水号 + */ + @SerializedName("serial_no") + private String serialNo; + + /** + * 操作日期 + */ + @SerializedName("trans_date") + private String transDate; + + /** + * 操作时间 + */ + @SerializedName("trans_tradetime") + private String transTradeTime; + + /** + * 发票编号 + */ + @SerializedName("invoice_no") + private String invoiceNo; + + @SerializedName("current_page") + private String currentPage; + + @SerializedName("current_rows") + private String currentRows; +} diff --git a/scfs-api-service-equity/src/main/java/com/czcb/scfs/service/equity/invoice/model/InvoiceTransQueryResponse.java b/scfs-api-service-equity/src/main/java/com/czcb/scfs/service/equity/invoice/model/InvoiceTransQueryResponse.java new file mode 100644 index 0000000..bd9c5de --- /dev/null +++ b/scfs-api-service-equity/src/main/java/com/czcb/scfs/service/equity/invoice/model/InvoiceTransQueryResponse.java @@ -0,0 +1,133 @@ +package com.czcb.scfs.service.equity.invoice.model; + +import com.czcb.scfs.api.core.PageApiResponse; +import com.google.gson.annotations.SerializedName; +import lombok.Data; +import lombok.experimental.Accessors; + +import java.io.Serializable; +import java.math.BigDecimal; +import java.util.List; + +/** + * @author wangwei + * @since 2024/7/8 + */ +@Data +@Accessors(chain = true) +public class InvoiceTransQueryResponse implements PageApiResponse { + /** + * 000000：表示成功 + */ + @SerializedName("recode") + private String recode; + + /** + * 结果信息 + */ + @SerializedName("recode_info") + private String recodeInfo; + /** + * 系统流水号 + */ + @SerializedName("sys_serial_no") + private String sysSerialNo; + + /** + * 系统日期（YYYY-MM-DD） + */ + @SerializedName("sys_date") + private String sysDate; + + /** + * 系统时间（YYYY-MM-DD hh:mm:ss） + */ + @SerializedName("sys_time") + private String sysTime; + + @SerializedName("data") + private List data; + + @SerializedName("current_page") + private String currentPage; + + @SerializedName("total_page") + private String totalPage; + + @SerializedName("total_rows") + private String totalRows; + + @Data + public static class InvoiceTransData implements Serializable { + /** + * 发票编号 + */ + @SerializedName("invoice_no") + private String invoiceNo; + /** + * 来账流水号 + */ + @SerializedName("deposit_serial_no") + private String depositSerialNo; + /** + * 付款账户账号 + */ + @SerializedName("account_no") + private String accountNo; + /** + * 付款账户户名 + */ + @SerializedName("account_name") + private String accountName; + /** + * 收款账户账号（入账账户） + */ + @SerializedName("opp_account_no") + private String oppAccountNo; + /** + * 收款账户户名（入账账户） + */ + @SerializedName("opp_account_name") + private String oppAccountName; + /** + * 归集账户账号（待清算账户/可控电商A2） + */ + @SerializedName("settle_account_no") + private String settleAccountNo; + /** + * 归集账户户名（待清算账户/可控电商A2） + */ + @SerializedName("settle_account_name") + private String settleAccountName; + /** + * 发票金额 + */ + @SerializedName("invoice_amount") + private BigDecimal invoiceAmount; + /** + * 已结算金额 + */ + @SerializedName("settle_amount") + private BigDecimal settleAmount; + /** + * 1、自动匹配 2、人工匹配 + */ + @SerializedName("match_type") + private String matchType; + /** + * 0、未匹配 1、匹配成功 + */ + @SerializedName("match_status") + private String matchStatus; + /** + * 创建时间 + */ + @SerializedName("create_time") + private String createTime; + /** + * 更新时间 + */ + @SerializedName("update_time") + private String updateTime; + } +} diff --git a/scfs-api-test/src/main/resources/application.properties b/scfs-api-test/src/main/resources/application.properties index aa9ada9..8dce0ca 100644 --- a/scfs-api-test/src/main/resources/application.properties +++ b/scfs-api-test/src/main/resources/application.properties @@ -1,7 +1,7 @@ scfs.api-gateway.online=false -scfs.api-gateway.host=http://10.133.135.94:8088/api-gateway -#scfs.api-gateway.host=http://127.0.0.1:8088/api-gateway -scfs.api-gateway.channel.channel-no=0000 +#scfs.api-gateway.host=http://10.133.135.94:8088/api-gateway +scfs.api-gateway.host=http://127.0.0.1:8088/api-gateway +scfs.api-gateway.channel.channel-no=1028 scfs.api-gateway.channel.app-no=41 scfs.api-gateway.cipher.store-type=resources #scfs.api-gateway.cipher.channel-private-key=invalid_rsa_private_key.pem