From 56ea73377219fd3c6ee242017f5fdbe6a3717c22 Mon Sep 17 00:00:00 2001 From: YuChuan Date: Thu, 11 Jun 2026 14:04:25 +0800 Subject: [PATCH] feat mch --- .../v2/order/MchSummarySettleService.java | 25 +++++++ ...hSettleSummaryConsignCalculateRequest.java | 61 ++++++++++++++++ ...SettleSummaryConsignCalculateResponse.java | 59 +++++++++++++++ .../MchSettleSummaryConsignResponse.java | 6 ++ .../v2/order/model/MchSettleSummaryDTO.java | 5 ++ ...MchSettleSummaryMatchPageQueryRequest.java | 70 ++++++++++++++++++ ...chSettleSummaryMatchPageQueryResponse.java | 73 +++++++++++++++++++ 7 files changed, 299 insertions(+) create mode 100644 scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/order/model/MchSettleSummaryConsignCalculateRequest.java create mode 100644 scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/order/model/MchSettleSummaryConsignCalculateResponse.java create mode 100644 scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/order/model/MchSettleSummaryMatchPageQueryRequest.java create mode 100644 scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/order/model/MchSettleSummaryMatchPageQueryResponse.java diff --git a/scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/order/MchSummarySettleService.java b/scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/order/MchSummarySettleService.java index 4f68442..5081cb2 100644 --- a/scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/order/MchSummarySettleService.java +++ b/scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/order/MchSummarySettleService.java @@ -110,6 +110,31 @@ public class MchSummarySettleService { return httpResponse.getServiceResponse(); } + /** + * 310914-代销金额计算 + * + * @author yuchuan + * @since 2026/04/29 + */ + public MchSettleSummaryConsignCalculateResponse mchSettleSummaryConsignCalculate(MchSettleSummaryConsignCalculateRequest request) { + String url = "/mch-settle-summary/consign/calculate"; + HttpResponse httpResponse = apiClient.post(url, HttpHeaders.apiVersionV2(), + request.toJsonRequest(), MchSettleSummaryConsignCalculateResponse.class); + return httpResponse.getServiceResponse(); + } + /** + * 310911-结算汇总单匹配明细分页查询 + * + * @author yuchuan + * @since 2026/04/29 + */ + public MchSettleSummaryMatchPageQueryResponse mchSettleSummaryMatchPageQuery(MchSettleSummaryMatchPageQueryRequest request) { + String url = "/mch-settle-summary-match/find/page"; + HttpResponse httpResponse = apiClient.post(url, HttpHeaders.apiVersionV2(), + request.toJsonRequest(), MchSettleSummaryMatchPageQueryResponse.class); + return httpResponse.getServiceResponse(); + } + } diff --git a/scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/order/model/MchSettleSummaryConsignCalculateRequest.java b/scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/order/model/MchSettleSummaryConsignCalculateRequest.java new file mode 100644 index 0000000..5dae388 --- /dev/null +++ b/scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/order/model/MchSettleSummaryConsignCalculateRequest.java @@ -0,0 +1,61 @@ +package com.czcb.scfs.api.service.v2.order.model; + +import com.czcb.scfs.api.core.ApiRequest; +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; + +/** + * 310914-代销金额计算 + * + * @author yuchuan + * @since 2026/04/29 + */ +@Data +@Accessors(chain = true) +@TransType("310914") +public class MchSettleSummaryConsignCalculateRequest implements ApiRequest { + /** + * 渠道编号 + */ + @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("contract_no") + private String contractNo; + + /** + * 应结算金额 + */ + @SerializedName("need_settle_amount") + private BigDecimal needSettleAmount; +} diff --git a/scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/order/model/MchSettleSummaryConsignCalculateResponse.java b/scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/order/model/MchSettleSummaryConsignCalculateResponse.java new file mode 100644 index 0000000..999aeb5 --- /dev/null +++ b/scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/order/model/MchSettleSummaryConsignCalculateResponse.java @@ -0,0 +1,59 @@ +package com.czcb.scfs.api.service.v2.order.model; + +import com.czcb.scfs.api.core.ApiResponse; +import com.google.gson.annotations.SerializedName; +import lombok.Data; +import lombok.experimental.Accessors; + +import java.math.BigDecimal; + +/** + * 310914-代销金额计算 + * + * @author yuchuan + * @since 2026/04/29 + */ +@Data +@Accessors(chain = true) +public class MchSettleSummaryConsignCalculateResponse 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; + + /** + * 预计代销额度 + */ + @SerializedName("consign_limit") + private BigDecimal consignLimit; + + + + + +} diff --git a/scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/order/model/MchSettleSummaryConsignResponse.java b/scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/order/model/MchSettleSummaryConsignResponse.java index 6b4dedc..72e6561 100644 --- a/scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/order/model/MchSettleSummaryConsignResponse.java +++ b/scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/order/model/MchSettleSummaryConsignResponse.java @@ -52,6 +52,12 @@ public class MchSettleSummaryConsignResponse implements ApiResponse { @SerializedName("consign_year_limit") private BigDecimal consignYearLimit; + /** + * 已使用代销限额 + */ + @SerializedName("used_consign_year_limit") + private BigDecimal usedConsignYearLimit; + /** * 累计应结算总额 */ diff --git a/scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/order/model/MchSettleSummaryDTO.java b/scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/order/model/MchSettleSummaryDTO.java index d3912e8..856c833 100644 --- a/scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/order/model/MchSettleSummaryDTO.java +++ b/scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/order/model/MchSettleSummaryDTO.java @@ -75,6 +75,11 @@ public class MchSettleSummaryDTO implements Serializable { */ @SerializedName("need_settle_amount") private BigDecimal needSettleAmount; + /** + * 预计代销额度 + */ + @SerializedName("consign_limit") + private BigDecimal consignLimit; /** * 结算单日期 */ diff --git a/scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/order/model/MchSettleSummaryMatchPageQueryRequest.java b/scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/order/model/MchSettleSummaryMatchPageQueryRequest.java new file mode 100644 index 0000000..c4c9290 --- /dev/null +++ b/scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/order/model/MchSettleSummaryMatchPageQueryRequest.java @@ -0,0 +1,70 @@ +package com.czcb.scfs.api.service.v2.order.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; +import java.util.Date; + +/** + *

+ * 结算汇总单匹配明细分页查询-310911 应答参数 + *

+ * + * @author yuchuan + * @since 2026/04/29 + */ +@Data +@Accessors(chain = true) +@TransType("310911") +public class MchSettleSummaryMatchPageQueryRequest 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("data") + private MchSettleSummaryMatchDTO data; +} diff --git a/scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/order/model/MchSettleSummaryMatchPageQueryResponse.java b/scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/order/model/MchSettleSummaryMatchPageQueryResponse.java new file mode 100644 index 0000000..5e90bf2 --- /dev/null +++ b/scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/order/model/MchSettleSummaryMatchPageQueryResponse.java @@ -0,0 +1,73 @@ +package com.czcb.scfs.api.service.v2.order.model; + +import com.czcb.scfs.api.core.PageApiResponse; +import com.google.gson.annotations.SerializedName; +import lombok.Data; +import lombok.experimental.Accessors; + +import java.util.List; + + +/** + *

+ * 结算汇总单匹配明细分页查询-310911 应答参数 + *

+ * + * @author yuchuan + * @since 2026/04/29 + */ +@Data +@Accessors(chain = true) +public class MchSettleSummaryMatchPageQueryResponse 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 checkbillDetailDTOList; + +}