From 6538214d934f8240fd8683903a2076c1543bc330 Mon Sep 17 00:00:00 2001 From: wb2476 Date: Tue, 24 Mar 2026 09:36:21 +0800 Subject: [PATCH] =?UTF-8?q?feat:=E7=94=B5=E5=95=86GMV-=E6=B1=87=E6=80=BB?= =?UTF-8?q?=E8=AE=A2=E5=8D=95=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/v2/order/SummaryOrderService.java | 94 ++++++ .../order/model/SummaryOrderAddRequest.java | 81 +++++ .../order/model/SummaryOrderDelRequest.java | 29 ++ .../order/model/SummaryOrderModRequest.java | 50 +++ .../model/SummaryOrderQueryDetailRequest.java | 29 ++ .../SummaryOrderQueryDetailResponse.java | 284 ++++++++++++++++++ .../model/SummaryOrderQueryPageRequest.java | 82 +++++ .../model/SummaryOrderQueryPageResponse.java | 163 ++++++++++ .../boot/starter/ScfsAutoConfiguration.java | 10 +- .../src/main/resources/application.properties | 4 +- 10 files changed, 823 insertions(+), 3 deletions(-) create mode 100644 scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/order/SummaryOrderService.java create mode 100644 scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/order/model/SummaryOrderAddRequest.java create mode 100644 scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/order/model/SummaryOrderDelRequest.java create mode 100644 scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/order/model/SummaryOrderModRequest.java create mode 100644 scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/order/model/SummaryOrderQueryDetailRequest.java create mode 100644 scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/order/model/SummaryOrderQueryDetailResponse.java create mode 100644 scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/order/model/SummaryOrderQueryPageRequest.java create mode 100644 scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/order/model/SummaryOrderQueryPageResponse.java diff --git a/scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/order/SummaryOrderService.java b/scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/order/SummaryOrderService.java new file mode 100644 index 0000000..6af06a7 --- /dev/null +++ b/scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/order/SummaryOrderService.java @@ -0,0 +1,94 @@ +package com.czcb.scfs.api.service.v2.order; + +import com.czcb.scfs.api.core.ApiClient; +import com.czcb.scfs.api.core.http.HttpHeaders; +import com.czcb.scfs.api.core.http.HttpResponse; +import com.czcb.scfs.api.service.v2.order.model.*; + +import static com.czcb.scfs.api.core.Constants.API_VERSION; +import static com.czcb.scfs.api.core.Constants.V_2; + +/** + * 汇总订单管理 + * + * @author H.T + * @since 2026-03-23 + */ +public class SummaryOrderService { + + private final ApiClient apiClient; + + public SummaryOrderService(ApiClient apiClient) { + this.apiClient = apiClient; + } + + /** + * 310407-汇总订单登记 + * + * @author H.T + * @since 2026/3/23 + */ + public OrderBaseResponse add(SummaryOrderAddRequest request) { + String url = "/summary-order/add"; + HttpHeaders headers = new HttpHeaders(); + headers.addHeader(API_VERSION, V_2); + HttpResponse httpResponse = apiClient.post(url, headers, request.toJsonRequest(), OrderBaseResponse.class); + return httpResponse.getServiceResponse(); + } + + /** + * 310408-汇总订单修正 + * + * @author H.T + * @since 2026/3/24 + */ + public OrderBaseResponse mod(SummaryOrderModRequest request) { + String url = "/summary-order/mod"; + HttpHeaders headers = new HttpHeaders(); + headers.addHeader(API_VERSION, V_2); + HttpResponse httpResponse = apiClient.post(url, headers, request.toJsonRequest(), OrderBaseResponse.class); + return httpResponse.getServiceResponse(); + } + + /** + * 310409-汇总订单删除 + * + * @author H.T + * @since 2026/3/24 + */ + public OrderBaseResponse del(SummaryOrderDelRequest request) { + String url = "/summary-order/del"; + HttpHeaders headers = new HttpHeaders(); + headers.addHeader(API_VERSION, V_2); + HttpResponse httpResponse = apiClient.post(url, headers, request.toJsonRequest(), OrderBaseResponse.class); + return httpResponse.getServiceResponse(); + } + + /** + * 310410-汇总订单分页查询 + * + * @author H.T + * @since 2026/3/24 + */ + public SummaryOrderQueryPageResponse page(SummaryOrderQueryPageRequest request) { + String url = "/summary-order/query-page"; + HttpHeaders headers = new HttpHeaders(); + headers.addHeader(API_VERSION, V_2); + HttpResponse httpResponse = apiClient.post(url, headers, request.toJsonRequest(), SummaryOrderQueryPageResponse.class); + return httpResponse.getServiceResponse(); + } + + /** + * 310411-汇总订单详情查看 + * + * @author H.T + * @since 2026/3/24 + */ + public SummaryOrderQueryDetailResponse detail(SummaryOrderQueryDetailRequest request) { + String url = "/summary-order/query-detail"; + HttpHeaders headers = new HttpHeaders(); + headers.addHeader(API_VERSION, V_2); + HttpResponse httpResponse = apiClient.post(url, headers, request.toJsonRequest(), SummaryOrderQueryDetailResponse.class); + return httpResponse.getServiceResponse(); + } +} diff --git a/scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/order/model/SummaryOrderAddRequest.java b/scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/order/model/SummaryOrderAddRequest.java new file mode 100644 index 0000000..9ea9d4e --- /dev/null +++ b/scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/order/model/SummaryOrderAddRequest.java @@ -0,0 +1,81 @@ +package com.czcb.scfs.api.service.v2.order.model; + +import com.czcb.scfs.api.core.agrs.TransType; +import com.google.gson.annotations.SerializedName; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.ToString; +import lombok.experimental.Accessors; + +import java.io.Serializable; +import java.math.BigDecimal; + +/** + * 310407-汇总订单登记请求参数 + * + * @author H.T + * @since 2026-03-23 + */ +@Data +@Accessors(chain = true) +@ToString(callSuper = true) +@EqualsAndHashCode(callSuper = true) +@TransType("310407") +public class SummaryOrderAddRequest extends OrderBaseRequest implements Serializable { + /** + * 电商编号 + */ + @SerializedName("mch_no") + private String mchNo; + /** + * 电商名称 + */ + @SerializedName("mch_name") + private String mchName; + /** + * 订单编号 + */ + @SerializedName("order_no") + private String orderNo; + /** + * 订单日期 yyyy-MM-dd + */ + @SerializedName("order_date") + private String orderDate; + /** + * 订单总额 + */ + @SerializedName("order_amount") + private BigDecimal orderAmount; + /** + * 已发货未收款总额 + */ + @SerializedName("order_amount_1") + private BigDecimal orderAmount1; + /** + * 预计退货总额 + */ + @SerializedName("order_amount_2") + private BigDecimal orderAmount2; + /** + * 预计应收款总额 + */ + @SerializedName("order_amount_3") + private BigDecimal orderAmount3; + /** + * 实际退货总额 + */ + @SerializedName("order_amount_4") + private BigDecimal orderAmount4; + /** + * 订单融资额度（可融资总额），校验最大可融资额度（预计应收总额*0.75） + */ + @SerializedName("credit_limit") + private BigDecimal creditLimit; + /** + * 摘要 + * PS：接口重构后由非空改为可以为空 + */ + @SerializedName("remark") + private String remark; +} diff --git a/scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/order/model/SummaryOrderDelRequest.java b/scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/order/model/SummaryOrderDelRequest.java new file mode 100644 index 0000000..385a908 --- /dev/null +++ b/scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/order/model/SummaryOrderDelRequest.java @@ -0,0 +1,29 @@ +package com.czcb.scfs.api.service.v2.order.model; + +import com.czcb.scfs.api.core.agrs.TransType; +import com.google.gson.annotations.SerializedName; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.ToString; +import lombok.experimental.Accessors; + +import java.io.Serializable; + +/** + * 310409-汇总订单删除请求参数 + * + * @author H.T + * @since 2026-03-12 + */ +@Data +@Accessors(chain = true) +@ToString(callSuper = true) +@EqualsAndHashCode(callSuper = true) +@TransType("310409") +public class SummaryOrderDelRequest extends OrderBaseRequest implements Serializable { + /** + * 订单编号 + */ + @SerializedName("order_no") + private String orderNo; +} diff --git a/scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/order/model/SummaryOrderModRequest.java b/scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/order/model/SummaryOrderModRequest.java new file mode 100644 index 0000000..b94084b --- /dev/null +++ b/scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/order/model/SummaryOrderModRequest.java @@ -0,0 +1,50 @@ +package com.czcb.scfs.api.service.v2.order.model; + +import com.czcb.scfs.api.core.agrs.TransType; +import com.google.gson.annotations.SerializedName; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.ToString; +import lombok.experimental.Accessors; + +import java.io.Serializable; +import java.math.BigDecimal; + +/** + * 310408-汇总订单修正请求参数 + * + * @author H.T + * @since 2026-03-11 + */ +@Data +@Accessors(chain = true) +@ToString(callSuper = true) +@EqualsAndHashCode(callSuper = true) +@TransType("310407") +public class SummaryOrderModRequest extends OrderBaseRequest implements Serializable { + /** + * 订单编号 + */ + @SerializedName("order_no") + private String orderNo; + /** + * 已发货未收款总额 + */ + @SerializedName("order_amount_1") + private BigDecimal orderAmount1; + /** + * 预计应收款总额 + */ + @SerializedName("order_amount_3") + private BigDecimal orderAmount3; + /** + * 实际退货总额 + */ + @SerializedName("order_amount_4") + private BigDecimal orderAmount4; + /** + * 订单融资额度（可融资总额），校验最大可融资额度（预计应收总额*0.75） + */ + @SerializedName("credit_limit") + private BigDecimal creditLimit; +} diff --git a/scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/order/model/SummaryOrderQueryDetailRequest.java b/scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/order/model/SummaryOrderQueryDetailRequest.java new file mode 100644 index 0000000..bb65f27 --- /dev/null +++ b/scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/order/model/SummaryOrderQueryDetailRequest.java @@ -0,0 +1,29 @@ +package com.czcb.scfs.api.service.v2.order.model; + +import com.czcb.scfs.api.core.agrs.TransType; +import com.google.gson.annotations.SerializedName; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.ToString; +import lombok.experimental.Accessors; + +import java.io.Serializable; + +/** + * 310411-汇总订单详情查看请求参数 + * + * @author H.T + * @since 2026-03-23 + */ +@Data +@Accessors(chain = true) +@ToString(callSuper = true) +@EqualsAndHashCode(callSuper = true) +@TransType("310407") +public class SummaryOrderQueryDetailRequest extends OrderBaseRequest implements Serializable { + /** + * 订单编号 + */ + @SerializedName("order_no") + private String orderNo; +} diff --git a/scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/order/model/SummaryOrderQueryDetailResponse.java b/scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/order/model/SummaryOrderQueryDetailResponse.java new file mode 100644 index 0000000..315d2a6 --- /dev/null +++ b/scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/order/model/SummaryOrderQueryDetailResponse.java @@ -0,0 +1,284 @@ +package com.czcb.scfs.api.service.v2.order.model; + +import com.google.gson.annotations.SerializedName; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.ToString; +import lombok.experimental.Accessors; + +import java.io.Serializable; +import java.math.BigDecimal; +import java.util.List; + +/** + * 310411-汇总订单详情查看响应参数 + * + * @author H.T + * @since 2026-03-23 + */ +@Data +@ToString(callSuper = true) +@Accessors(chain = true) +@EqualsAndHashCode(callSuper = true) +public class SummaryOrderQueryDetailResponse extends OrderBaseResponse implements Serializable { + /** + * 电商编号 + */ + @SerializedName("mch_no") + private String mchNo; + /** + * 电商名称 + */ + @SerializedName("mch_name") + private String mchName; + /** + * 订单编号 + */ + @SerializedName("order_no") + private String orderNo; + /** + * 订单日期yyyy-MM-dd + */ + @SerializedName("order_date") + private String orderDate; + /** + * 订单总额 + */ + @SerializedName("order_amount") + private BigDecimal orderAmount; + /** + * 已发货未收款总额 + */ + @SerializedName("order_amount_1") + private BigDecimal orderAmount1; + /** + * 预计退款总额 + */ + @SerializedName("order_amount_2") + private BigDecimal orderAmount2; + /** + * 预计应收款总额 + */ + @SerializedName("order_amount_3") + private BigDecimal orderAmount3; + /** + * 实际退款总额 + */ + @SerializedName("order_amount_4") + private BigDecimal orderAmount4; + /** + * 订单融资额度（可融资总额） + */ + @SerializedName("credit_limit") + private BigDecimal creditLimit; + /** + * 放款总额（累计融资金额） + */ + @SerializedName("loan_amount_sum") + private BigDecimal loanAmountSum; + /** + * 累计已补足差额 + */ + @SerializedName("sup_diff_amount") + private BigDecimal supDiffAmount; + /** + * 订单摘要 + */ + @SerializedName("remark") + private String remark; + /** + * 订单状态：0、已登记 1、已完结 + */ + @SerializedName("order_status") + private String orderStatus; + /** + * 清算流水号 + */ + @SerializedName("settle_serial_no") + private String settleSerialNo; + /** + * 清算状态 0:未清算 1：已清算并还款 + */ + @SerializedName("settle_status") + private String settleStatus; + /** + * 清算时间 + */ + @SerializedName("settle_time") + private String settleTime; + /** + * 清算摘要 + */ + @SerializedName("settle_remark") + private String settleRemark; + /** + * 创建时间 + */ + @SerializedName("create_time") + private String createTime; + /** + * 更新时间 + */ + @SerializedName("update_time") + private String updateTime; + /** + * 已清算总额 + */ + @SerializedName("settle_amount_total") + private BigDecimal settleAmountTotal; + /** + * 已扣点总额 + */ + @SerializedName("deduct_amount_total") + private BigDecimal deductAmountTotal; + /** + * 已解冻总额 + */ + @SerializedName("unfreeze_amount_total") + private BigDecimal unfreezeAmountTotal; + /** + * 已还本金总额 + */ + @SerializedName("repay_amount_bj_total") + private BigDecimal repayAmountBjTotal; + /** + * 已付利息总额 + */ + @SerializedName("repay_amount_lx_total") + private BigDecimal repayAmountLxTotal; + /** + * 已付服务费总额 + */ + @SerializedName("pay_fee_total") + private BigDecimal payFeeTotal; + + /** + * 汇总订单贷款信息 + */ + @SerializedName("credit_data") + private List data; + + @Data + public static class OrderLiveCreditInfoData implements Serializable { + /** + * 电商编号 + */ + @SerializedName("mch_no") + private String mchNo; + /** + * 电商名称 + */ + @SerializedName("mch_name") + private String mchName; + /** + * 订单编号 + */ + @SerializedName("order_no") + private String orderNo; + /** + * 贷款产品编号 + */ + @SerializedName("product_id") + private String productId; + /** + * 贷款合同编号 + */ + @SerializedName("contract_no") + private String contractNo; + /** + * 贷款申请人账号 + */ + @SerializedName("account_no") + private String accountNo; + /** + * 贷款申请人户名 + */ + @SerializedName("account_name") + private String accountName; + /** + * 贷款账号（借据编号） + */ + @SerializedName("loanacctno") + private String loanAcctNo; + /** + * 贷款账号序号 + */ + @SerializedName("acctseqno") + private String acctSeqNo; + /** + * 放款金额 + */ + @SerializedName("loan_amount") + private BigDecimal loanAmount; + /** + * 放款日期yyyy-MM-dd + */ + @SerializedName("loan_date") + private String loanDate; + /** + * 放款时间yyyy-MM-dd hh:mm:ss + */ + @SerializedName("loan_time") + private String loanTime; + /** + * 放款的系统流水号 + */ + @SerializedName("sys_serial_no") + private String sysSerialNo; + /** + * 核心流水号（轮询流水号） + */ + @SerializedName("core_serial_no") + private String coreSerialNo; + /** + * 放款摘要 + */ + @SerializedName("remark") + private String remark; + /** + * 还款的系统流水号 + */ + @SerializedName("repay_serial_no") + private String repaySerialNo; + /** + * 还款状态 0、未还款 1、还款成功 2、还款失败 + */ + @SerializedName("repay_status") + private String repayStatus; + /** + * 还款失败原因 + */ + @SerializedName("repay_fail_msg") + private String repayFailMsg; + /** + * 还款本金 + */ + @SerializedName("repay_amount_bj") + private BigDecimal repayAmountBj; + /** + * 还款利息 + */ + @SerializedName("repay_amount_lx") + private BigDecimal repayAmountLx; + /** + * 还款时间yyyy-MM-dd hh:mm:ss + */ + @SerializedName("repay_time") + private String repayTime; + /** + * 还款摘要 + */ + @SerializedName("repay_remark") + private String repayRemark; + /** + * 创建时间 + */ + @SerializedName("create_time") + private String createTime; + /** + * 更新时间 + */ + @SerializedName("update_time") + private String updateTime; + } +} diff --git a/scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/order/model/SummaryOrderQueryPageRequest.java b/scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/order/model/SummaryOrderQueryPageRequest.java new file mode 100644 index 0000000..e6c922d --- /dev/null +++ b/scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/order/model/SummaryOrderQueryPageRequest.java @@ -0,0 +1,82 @@ +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.ToString; +import lombok.experimental.Accessors; + +/** + * 310410-汇总订单分页查询请求参数 + * + * @author H.T + * @since 2026-03-23 + */ +@Data +@Accessors(chain = true) +@ToString(callSuper = true) +@TransType("310410") +public class SummaryOrderQueryPageRequest 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("mch_no") + private String mchNo; + /** + * 电商名称 + */ + @SerializedName("mch_name") + private String mchName; + /** + * 订单编号 + */ + @SerializedName("order_no") + private String orderNo; + /** + * 订单状态 + */ + @SerializedName("order_status") + private String orderStatus; + /** + * 清算状态 + */ + @SerializedName("settle_status") + private String settleStatus; + /** + * 订单日期-开始 + */ + @SerializedName("order_date_start") + private String orderDateStart; + /** + * 订单日期-截至 + */ + @SerializedName("order_date_end") + private String orderDateEnd; +} diff --git a/scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/order/model/SummaryOrderQueryPageResponse.java b/scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/order/model/SummaryOrderQueryPageResponse.java new file mode 100644 index 0000000..d93f563 --- /dev/null +++ b/scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/order/model/SummaryOrderQueryPageResponse.java @@ -0,0 +1,163 @@ +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.ToString; +import lombok.experimental.Accessors; + +import java.io.Serializable; +import java.math.BigDecimal; +import java.util.List; + +/** + * 310410-汇总订单分页查询应答参数 + * + * @author H.T + * @since 2026-03-23 + */ +@Data +@ToString(callSuper = true) +@Accessors(chain = true) +public class SummaryOrderQueryPageResponse implements PageApiResponse { + + /** + * 查询结果集 + */ + @SerializedName("data") + private List data; + + @Data + public static class OrderLiveInfoData implements Serializable { + /** + * 电商编号 + */ + @SerializedName("mch_no") + private String mchNo; + /** + * 电商名称 + */ + @SerializedName("mch_name") + private String mchName; + /** + * 订单编号 + */ + @SerializedName("order_no") + private String orderNo; + /** + * 订单日期yyyy-MM-dd + */ + @SerializedName("order_date") + private String orderDate; + /** + * 订单总额 + */ + @SerializedName("order_amount") + private BigDecimal orderAmount; + /** + * 已发货未收款总额 + */ + @SerializedName("order_amount_1") + private BigDecimal orderAmount1; + /** + * 预计退款总额 + */ + @SerializedName("order_amount_2") + private BigDecimal orderAmount2; + /** + * 预计应收款总额 + */ + @SerializedName("order_amount_3") + private BigDecimal orderAmount3; + /** + * 实际退款总额 + */ + @SerializedName("order_amount_4") + private BigDecimal orderAmount4; + /** + * 订单融资额度（可融资总额） + */ + @SerializedName("credit_limit") + private BigDecimal creditLimit; + /** + * 放款总额（累计融资金额） + */ + @SerializedName("loan_amount_sum") + private BigDecimal loanAmountSum; + /** + * 累计已补足差额 + */ + @SerializedName("sup_diff_amount") + private BigDecimal supDiffAmount; + /** + * 已清算总额 + */ + @SerializedName("settle_amount_total") + private BigDecimal settleAmountTotal; + /** + * 已扣点总额 + */ + @SerializedName("deduct_amount_total") + private BigDecimal deductAmountTotal; + /** + * 已解冻总额 + */ + @SerializedName("unfreeze_amount_total") + private BigDecimal unfreezeAmountTotal; + /** + * 已还本金总额 + */ + @SerializedName("repay_amount_bj_total") + private BigDecimal repayAmountBjTotal; + /** + * 已付利息总额 + */ + @SerializedName("repay_amount_lx_total") + private BigDecimal repayAmountLxTotal; + /** + * 已付服务费总额 + */ + @SerializedName("pay_fee_total") + private BigDecimal payFeeTotal; + /** + * 订单摘要 + */ + @SerializedName("remark") + private String remark; + /** + * 订单状态：0、已登记 1、已完结 + */ + @SerializedName("order_status") + private String orderStatus; + /** + * 清算流水号 + */ + @SerializedName("settle_serial_no") + private String settleSerialNo; + /** + * 清算状态 0:未清算 1：已清算并还款 + */ + @SerializedName("settle_status") + private String settleStatus; + /** + * 清算时间 + */ + @SerializedName("settle_time") + private String settleTime; + /** + * 清算摘要 + */ + @SerializedName("settle_remark") + private String settleRemark; + /** + * 创建时间 + */ + @SerializedName("create_time") + private String createTime; + /** + * 更新时间 + */ + @SerializedName("update_time") + private String updateTime; + } +} diff --git a/scfs-api-spring-boot-starter/src/main/java/com/czcb/scfs/spring/boot/starter/ScfsAutoConfiguration.java b/scfs-api-spring-boot-starter/src/main/java/com/czcb/scfs/spring/boot/starter/ScfsAutoConfiguration.java index b0e7712..402f97a 100644 --- a/scfs-api-spring-boot-starter/src/main/java/com/czcb/scfs/spring/boot/starter/ScfsAutoConfiguration.java +++ b/scfs-api-spring-boot-starter/src/main/java/com/czcb/scfs/spring/boot/starter/ScfsAutoConfiguration.java @@ -339,5 +339,13 @@ public class ScfsAutoConfiguration { return new CreditContractService(apiClient); } - + /** + * 汇总订单管理 + */ + @Bean + @ConditionalOnMissingBean + @ConditionalOnClass(SummaryOrderService.class) + public SummaryOrderService summaryOrderService(ApiClient apiClient) { + return new SummaryOrderService(apiClient); + } } diff --git a/scfs-api-test/src/main/resources/application.properties b/scfs-api-test/src/main/resources/application.properties index 50aabb8..02f2c59 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 -# 外网地址 +# \u5916\u7F51\u5730\u5740 #scfs.api-gateway.host=http://124.160.111.105:29080/api-gateway -# 内网地址 +# \u5185\u7F51\u5730\u5740 #scfs.api-gateway.host=http://10.133.91.109:9080/api-gateway scfs.api-gateway.host=http://127.0.0.1:8088/api-gateway scfs.api-gateway.channel.channel-no=1039