From cd0fbe825dd47b952c0705577047f071e0abb194 Mon Sep 17 00:00:00 2001 From: wb3298 <1111@qq.com> Date: Wed, 18 Jun 2025 15:38:30 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E6=96=B0=E5=A2=9E=E5=8F=91=E7=A5=A8?= =?UTF-8?q?=E6=B1=A0=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../v2/account/model/QueryDetailRequest.java | 2 +- .../service/v2/invoice/InvoiceService.java | 22 ++++ .../model/InvoicePoolQueryRequest.java | 84 ++++++++++++++ .../model/InvoicePoolQueryResponse.java | 106 ++++++++++++++++++ .../invoice/model/OrderPoolSettleRequest.java | 53 +++++++++ .../model/OrderPoolSettleResponse.java | 46 ++++++++ 6 files changed, 312 insertions(+), 1 deletion(-) create mode 100644 scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/invoice/model/InvoicePoolQueryRequest.java create mode 100644 scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/invoice/model/InvoicePoolQueryResponse.java create mode 100644 scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/invoice/model/OrderPoolSettleRequest.java create mode 100644 scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/invoice/model/OrderPoolSettleResponse.java diff --git a/scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/account/model/QueryDetailRequest.java b/scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/account/model/QueryDetailRequest.java index 5f8b208..19f7895 100644 --- a/scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/account/model/QueryDetailRequest.java +++ b/scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/account/model/QueryDetailRequest.java @@ -12,7 +12,7 @@ import lombok.experimental.Accessors; */ @Data @Accessors(chain = true) -@TransType("222201") +@TransType("222202") public class QueryDetailRequest implements ApiRequest { /** * 渠道编号 diff --git a/scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/invoice/InvoiceService.java b/scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/invoice/InvoiceService.java index cac0b76..505e7e0 100644 --- a/scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/invoice/InvoiceService.java +++ b/scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/invoice/InvoiceService.java @@ -88,4 +88,26 @@ public class InvoiceService { request.toJsonRequest(), InvoiceSettleRepayResponse.class); return httpResponse.getServiceResponse(); } + + /** + * 232301-发票池分页查询 + */ + public InvoicePoolQueryResponse poolQuery(InvoicePoolQueryRequest request) { + String url = "/invoice/pool/query"; + HttpResponse httpResponse = apiClient.post(url, HttpHeaders.apiVersionV2(), + request.toJsonRequest(), InvoicePoolQueryResponse.class); + return httpResponse.getServiceResponse(); + } + + /** + * 310601-汇总订单清算还款（发票池版） + */ + public OrderPoolSettleResponse poolSettle(OrderPoolSettleRequest request) { + String url = "/order/pool/settle"; + HttpResponse httpResponse = apiClient.post(url, HttpHeaders.apiVersionV2(), + request.toJsonRequest(), OrderPoolSettleResponse.class); + return httpResponse.getServiceResponse(); + } + + } diff --git a/scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/invoice/model/InvoicePoolQueryRequest.java b/scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/invoice/model/InvoicePoolQueryRequest.java new file mode 100644 index 0000000..e774807 --- /dev/null +++ b/scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/invoice/model/InvoicePoolQueryRequest.java @@ -0,0 +1,84 @@ +package com.czcb.scfs.api.service.v2.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; + +import java.math.BigDecimal; + +/** + * 232301-发票池分页查询 + * + * @author yuchuan + * @since 2025-06-18 + */ +@Data +@Accessors(chain = true) +@TransType("232301") +public class InvoicePoolQueryRequest 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("current_page") + private Long currentPage; + + /** + * 每页行数 + */ + @SerializedName("current_rows") + private Long currentRows; + + /** + * 归集账户账号 + */ + @SerializedName("settle_account_no") + private String settleAccountNo; + /** + * 归集账户户名 + */ + @SerializedName("settle_account_name") + private String settleAccountName; + /** + * 发票池总额度 + */ + @SerializedName("total_limit") + private BigDecimal totalLimit; + /** + * 结算可用额度 + */ + @SerializedName("settle_avail_limit") + private BigDecimal settleAvailLimit; +} \ No newline at end of file diff --git a/scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/invoice/model/InvoicePoolQueryResponse.java b/scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/invoice/model/InvoicePoolQueryResponse.java new file mode 100644 index 0000000..31ca692 --- /dev/null +++ b/scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/invoice/model/InvoicePoolQueryResponse.java @@ -0,0 +1,106 @@ +package com.czcb.scfs.api.service.v2.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; + +/** + * 232301-发票池分页查询 + * + * @author yuchuan + * @since 2025-06-18 + */ +@Data +@Accessors(chain = true) +public class InvoicePoolQueryResponse 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("current_page") + private Long currentPage; + + /** + * 总页数 + */ + @SerializedName("total_page") + private Long totalPage; + + /** + * 总条数 + */ + @SerializedName("total_rows") + private Long totalRows; + + @SerializedName("data") + private List data; + + @Data + public static class InvoicePoolData implements Serializable { + /** + * 渠道编号 + */ + @SerializedName("channel_no") + private String channelNo; + /** + * 应用编号 + */ + @SerializedName("app_no") + private String appNo; + /** + * 归集账户账号 + */ + @SerializedName("settle_account_no") + private String settleAccountNo; + /** + * 归集账户户名 + */ + @SerializedName("settle_account_name") + private String settleAccountName; + /** + * 发票池总额度 + */ + @SerializedName("total_limit") + private BigDecimal totalLimit; + + /** + * 已匹配额度（结算可用额度） + */ + @SerializedName("settle_avail_limit") + private BigDecimal settleAvailLimit; + } +} \ No newline at end of file diff --git a/scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/invoice/model/OrderPoolSettleRequest.java b/scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/invoice/model/OrderPoolSettleRequest.java new file mode 100644 index 0000000..94e53cd --- /dev/null +++ b/scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/invoice/model/OrderPoolSettleRequest.java @@ -0,0 +1,53 @@ +package com.czcb.scfs.api.service.v2.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; + +/** + * 310601-汇总订单清算还款（发票池版） + * + * @author yuchuan + * @since 2025-06-18 + */ +@Data +@Accessors(chain = true) +@TransType("310601") +public class OrderPoolSettleRequest 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("order_no") + private String orderNo; +} diff --git a/scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/invoice/model/OrderPoolSettleResponse.java b/scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/invoice/model/OrderPoolSettleResponse.java new file mode 100644 index 0000000..8c81743 --- /dev/null +++ b/scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/invoice/model/OrderPoolSettleResponse.java @@ -0,0 +1,46 @@ +package com.czcb.scfs.api.service.v2.invoice.model; + +import com.czcb.scfs.api.core.ApiResponse; +import com.google.gson.annotations.SerializedName; +import lombok.Data; +import lombok.experimental.Accessors; + +/** + * 310601-汇总订单清算还款（发票池版） + * + * @author yuchuan + * @since 2025-06-18 + */ +@Data +@Accessors(chain = true) +public class OrderPoolSettleResponse implements ApiResponse { + /** + * 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; +}