From 63beb3bc1d8f6cb6ddf43b3597c4b3f4ae36f38f Mon Sep 17 00:00:00 2001 From: wb2476 Date: Fri, 26 Dec 2025 10:49:44 +0800 Subject: [PATCH] =?UTF-8?q?feat:=E9=85=8D=E9=80=81=E8=AE=A2=E5=8D=95?= =?UTF-8?q?=E7=AE=A1=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../v2/ar/model/ArcOrderDeliveryDTO.java | 279 ------------ .../v2/ar/model/ArcOrderDeliveryFileDTO.java | 78 ---- .../v2/ar/model/ArcOrderDeliveryGoodsDTO.java | 99 ---- .../v2/ar/model/ArcOrderDeliveryLoanDTO.java | 154 ------- .../ArcOrderDeliveryQueryByNoResponse.java | 425 +++++++++++++++++- .../ArcOrderDeliveryQueryPageRequest.java | 79 +++- .../ArcOrderDeliveryQueryPageResponse.java | 213 ++++++++- .../service/ArcOrderDeliveryServiceTest.java | 4 +- 8 files changed, 716 insertions(+), 615 deletions(-) delete mode 100644 scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/ar/model/ArcOrderDeliveryDTO.java delete mode 100644 scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/ar/model/ArcOrderDeliveryFileDTO.java delete mode 100644 scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/ar/model/ArcOrderDeliveryGoodsDTO.java delete mode 100644 scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/ar/model/ArcOrderDeliveryLoanDTO.java diff --git a/scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/ar/model/ArcOrderDeliveryDTO.java b/scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/ar/model/ArcOrderDeliveryDTO.java deleted file mode 100644 index ff7668a..0000000 --- a/scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/ar/model/ArcOrderDeliveryDTO.java +++ /dev/null @@ -1,279 +0,0 @@ -package com.czcb.scfs.api.service.v2.ar.model; - -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; - -/** - * 配送订单DTO - * - * @author H.T - * @since 2025-12-05 - */ -@Data -@Accessors(chain = true) -public class ArcOrderDeliveryDTO implements Serializable { - /** - * 渠道编号 - */ - @SerializedName("channel_no") - private String channelNo; - /** - * 应用编号 - */ - @SerializedName("app_no") - private String appNo; - /** - * 项目编号 - */ - @SerializedName("project_no") - private String projectNo; - /** - * 项目名称 - */ - @SerializedName("project_name") - private String projectName; - /** - * 父订单编号 - */ - @SerializedName("parent_order_no") - private String parentOrderNo; - /** - * 配送订单编号 - */ - @SerializedName("order_no") - private String orderNo; - /** - * 下单时间 yyyy-MM-dd HH:mm:ss - */ - @SerializedName("order_time") - private String orderTime; - /** - * 订单金额 - */ - @SerializedName("order_amount") - private BigDecimal orderAmount; - /** - * 订单描述 - */ - @SerializedName("order_note") - private String orderNote; - /** - * 订单状态：0-正常；1-作废 - */ - @SerializedName("order_status") - private String orderStatus; - /** - * 配送公司账号A1 - */ - @SerializedName("account_no_a1") - private String accountNoA1; - /** - * 配送公司账号A2 - */ - @SerializedName("account_no_a2") - private String accountNoA2; - /** - * 配送公司户名 - */ - @SerializedName("account_name") - private String accountName; - /** - * 合同编号 - */ - @SerializedName("contract_no") - private String contractNo; - /** - * 合同类型：1-采购合同；2-分包合同 - */ - @SerializedName("contract_type") - private String contractType; - /** - * 甲方名称 - */ - @SerializedName("party_a_name") - private String partyAName; - /** - * 甲方证件号码 - */ - @SerializedName("party_a_id_no") - private String partyAIdNo; - /** - * 乙方名称 - */ - @SerializedName("party_b_name") - private String partyBName; - /** - * 乙方证件号码 - */ - @SerializedName("party_b_id_no") - private String partyBIdNo; - /** - * 分包公司账号A1 - */ - @SerializedName("sub_account_no_a1") - private String subAccountNoA1; - /** - * 分包公司乙方账号 - */ - @SerializedName("sub_account_no_a2") - private String subAccountNoA2; - /** - * 分包公司户名 - */ - @SerializedName("sub_account_name") - private String subAccountName; - /** - * 扣点比例 - */ - @SerializedName("divide_prop") - private BigDecimal divideProp; - /** - * 结算账号 - */ - @SerializedName("settle_account_no") - private String settleAccountNo; - /** - * 结算户名 - */ - @SerializedName("settle_account_name") - private String settleAccountName; - /** - * 结算状态：0-未结算；1-已结算；2-部分结算；8-未知；9-结算失败 - */ - @SerializedName("settle_status") - private String settleStatus; - /** - * 结算时间 yyyy-MM-dd HH:mm:ss - */ - @SerializedName("settle_time") - private String settleTime; - /** - * 已结算金额 - */ - @SerializedName("settle_amount") - private BigDecimal settleAmount; - /** - * 已扣点金额 - */ - @SerializedName("deduct_amount") - private BigDecimal deductAmount; - /** - * 已解冻金额 - */ - @SerializedName("unfreeze_amount") - private BigDecimal unfreezeAmount; - /** - * 融资账号A1 - */ - @SerializedName("finance_account_no_a1") - private String financeAccountNoA1; - /** - * 融资账号A2 - */ - @SerializedName("finance_account_no_a2") - private String financeAccountNoA2; - /** - * 融资户名 - */ - @SerializedName("finance_account_name") - private String financeAccountName; - /** - * 失效日期 yyyy-MM-dd - */ - @SerializedName("finance_invalid_date") - private String financeInvalidDate; - /** - * 融资比例 - */ - @SerializedName("finance_prop") - private BigDecimal financeProp; - /** - * 可融资额度 - */ - @SerializedName("finance_limit") - private BigDecimal financeLimit; - /** - * 已提款总额 - */ - @SerializedName("finance_amount_total") - private BigDecimal financeAmountTotal; - /** - * 融资状态：0-未融资；1-已融资；2-部分融资；8-未知；9-融资失败 - */ - @SerializedName("finance_status") - private String financeStatus; - /** - * 已还本金 - */ - @SerializedName("repay_amount_bj") - private BigDecimal repayAmountBj; - /** - * 已还利息 - */ - @SerializedName("repay_amount_lx") - private BigDecimal repayAmountLx; - /** - * 已付服务费 - */ - @SerializedName("pay_fee") - private BigDecimal payFee; - /** - * 创建时间 yyyy-MM-dd HH:mm:ss - */ - @SerializedName("create_time") - private String createTime; - /** - * 创建人 - */ - @SerializedName("creator") - private String creator; - /** - * 更新时间 yyyy-MM-dd HH:mm:ss - */ - @SerializedName("update_time") - private String updateTime; - /** - * 更新人 - */ - @SerializedName("updater") - private String updater; - /** - * 记录状态（0：正常 1：删除） - */ - @SerializedName("record_status") - private String recordStatus; - - - ///////////////////////////////////// 以下字段为自定义 ///////////////////////////////////// - /** - * 订单时间-开始 yyyy-MM-dd - */ - @SerializedName("order_time_start") - private String orderTimeStart; - /** - * 订单时间-截至 yyyy-MM-dd - */ - @SerializedName("order_time_end") - private String orderTimeEnd; - - /** - * 商品清单List - */ - @SerializedName("goods_list") - private List goodsList; - /** - * 订单提款信息List - */ - @SerializedName("loan_list") - private List loanList; - /** - * 文件资料List - */ - @SerializedName("file_list") - private List fileList; -} diff --git a/scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/ar/model/ArcOrderDeliveryFileDTO.java b/scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/ar/model/ArcOrderDeliveryFileDTO.java deleted file mode 100644 index 6fce517..0000000 --- a/scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/ar/model/ArcOrderDeliveryFileDTO.java +++ /dev/null @@ -1,78 +0,0 @@ -package com.czcb.scfs.api.service.v2.ar.model; - -import com.google.gson.annotations.SerializedName; -import lombok.Data; -import lombok.experimental.Accessors; - -import java.io.Serializable; - -/** - * 配送订单文件资料DTO - * - * @author H.T - * @since 2025-12-05 - */ -@Data -@Accessors(chain = true) -public class ArcOrderDeliveryFileDTO implements Serializable { - /** - * 主键ID - */ - @SerializedName("id") - private Integer id; - /** - * 渠道编号 - */ - @SerializedName("channel_no") - private String channelNo; - /** - * 应用编号 - */ - @SerializedName("app_no") - private String appNo; - /** - * 订单编号 - */ - @SerializedName("order_no") - private String orderNo; - /** - * 文件编号 - */ - @SerializedName("file_no") - private String fileNo; - /** - * 文件类型：32、验收单 - */ - @SerializedName("file_type") - private String fileType; - /** - * 文件说明 - */ - @SerializedName("file_note") - private String fileNote; - /** - * 创建时间 - */ - @SerializedName("create_time") - private String createTime; - /** - * 创建人 - */ - @SerializedName("creator") - private String creator; - /** - * 更新时间 - */ - @SerializedName("update_time") - private String updateTime; - /** - * 更新人 - */ - @SerializedName("updater") - private String updater; - /** - * 记录状态（0：正常 1：删除） - */ - @SerializedName("record_status") - private String recordStatus; -} diff --git a/scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/ar/model/ArcOrderDeliveryGoodsDTO.java b/scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/ar/model/ArcOrderDeliveryGoodsDTO.java deleted file mode 100644 index 218f4fe..0000000 --- a/scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/ar/model/ArcOrderDeliveryGoodsDTO.java +++ /dev/null @@ -1,99 +0,0 @@ -package com.czcb.scfs.api.service.v2.ar.model; - -import com.google.gson.annotations.SerializedName; -import lombok.Data; -import lombok.experimental.Accessors; - -import java.io.Serializable; -import java.math.BigDecimal; - -/** - * 配送订单商品信息DTO - * - * @author H.T - * @since 2025-12-05 - */ -@Data -@Accessors(chain = true) -public class ArcOrderDeliveryGoodsDTO implements Serializable { - /** - * 渠道编号 - */ - @SerializedName("channel_no") - private String channelNo; - /** - * 应用编号 - */ - @SerializedName("app_no") - private String appNo; - /** - * 订单编号 - */ - @SerializedName("order_no") - private String orderNo; - /** - * 商品编号 - */ - @SerializedName("goods_no") - private String goodsNo; - /** - * 商品名称 - */ - @SerializedName("goods_name") - private String goodsName; - /** - * 商品数量 - */ - @SerializedName("goods_quantity") - private Integer goodsQuantity; - /** - * 计量单位 - */ - @SerializedName("goods_unit") - private String goodsUnit; - /** - * 商品单价 - */ - @SerializedName("goods_price") - private BigDecimal goodsPrice; - /** - * 商品金额=商品数量*商品单价 - */ - @SerializedName("goods_amount") - private BigDecimal goodsAmount; - /** - * 商品描述 - */ - @SerializedName("goods_note") - private String goodsNote; - /** - * 商品状态：0-正常；1-作废 - */ - @SerializedName("goods_status") - private String goodsStatus; - /** - * 创建时间 - */ - @SerializedName("create_time") - private String createTime; - /** - * 创建人 - */ - @SerializedName("creator") - private String creator; - /** - * 更新时间 - */ - @SerializedName("update_time") - private String updateTime; - /** - * 更新人 - */ - @SerializedName("updater") - private String updater; - /** - * 记录状态（0：正常 1：删除） - */ - @SerializedName("record_status") - private String recordStatus; -} diff --git a/scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/ar/model/ArcOrderDeliveryLoanDTO.java b/scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/ar/model/ArcOrderDeliveryLoanDTO.java deleted file mode 100644 index eca621e..0000000 --- a/scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/ar/model/ArcOrderDeliveryLoanDTO.java +++ /dev/null @@ -1,154 +0,0 @@ -package com.czcb.scfs.api.service.v2.ar.model; - -import com.google.gson.annotations.SerializedName; -import lombok.Data; -import lombok.experimental.Accessors; - -import java.io.Serializable; -import java.math.BigDecimal; - -/** - * 配送订单提款DTO - * - * @author H.T - * @since 2025-12-05 - */ -@Data -@Accessors(chain = true) -public class ArcOrderDeliveryLoanDTO implements Serializable { - /** - * 渠道编号 - */ - @SerializedName("channel_no") - private String channelNo; - /** - * 应用编号 - */ - @SerializedName("app_no") - private String appNo; - /** - * 请求流水号 - */ - @SerializedName("req_serial_no") - private String reqSerialNo; - /** - * 系统流水号 - */ - @SerializedName("sys_serial_no") - private String sysSerialNo; - /** - * 配送订单编号 - */ - @SerializedName("order_no") - private String orderNo; - /** - * 贷款合同编号 - */ - @SerializedName("contract_no") - private String contractNo; - /** - * 贷款申请账号 - */ - @SerializedName("apply_account_no") - private String applyAccountNo; - /** - * 贷款申请户名 - */ - @SerializedName("apply_account_name") - private String applyAccountName; - /** - * 贷款账号（借据编号） - */ - @SerializedName("loan_acct_no") - private String loanAcctNo; - /** - * 贷款账号序号 - */ - @SerializedName("acct_seq_no") - 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("core_serial_no") - private String coreSerialNo; - /** - * 提款摘要 - */ - @SerializedName("loan_remark") - private String loanRemark; - /** - * 还款流水号 - */ - @SerializedName("repay_serial_no") - private String repaySerialNo; - /** - * 还款状态：0-未还款；1-已还款；2-部分还款；8-未知；9-还款失败 - */ - @SerializedName("repay_status") - private String repayStatus; - /** - * 还款失败描述 - */ - @SerializedName("repay_fail_message") - private String repayFailMessage; - /** - * 还款本金 - */ - @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("creator") - private String creator; - /** - * 更新时间 - */ - @SerializedName("update_time") - private String updateTime; - /** - * 更新人 - */ - @SerializedName("updater") - private String updater; - /** - * 记录状态（0：正常 1：删除） - */ - @SerializedName("record_status") - private String recordStatus; -} diff --git a/scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/ar/model/ArcOrderDeliveryQueryByNoResponse.java b/scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/ar/model/ArcOrderDeliveryQueryByNoResponse.java index 8fd47b3..58c0237 100644 --- a/scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/ar/model/ArcOrderDeliveryQueryByNoResponse.java +++ b/scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/ar/model/ArcOrderDeliveryQueryByNoResponse.java @@ -7,6 +7,10 @@ import lombok.EqualsAndHashCode; import lombok.ToString; import lombok.experimental.Accessors; +import java.io.Serializable; +import java.math.BigDecimal; +import java.util.List; + /** * 312305-配送订单详情查看(农都)响应参数 * @@ -18,6 +22,425 @@ import lombok.experimental.Accessors; @Accessors(chain = true) @EqualsAndHashCode(callSuper = true) public class ArcOrderDeliveryQueryByNoResponse extends ArcBaseResponse implements ApiResponse { + @SerializedName("data") - private ArcOrderDeliveryDTO data; + private ResponseData data; + + @Data + public static class ResponseData implements Serializable { + /** + * 项目编号 + */ + @SerializedName("project_no") + private String projectNo; + /** + * 项目名称 + */ + @SerializedName("project_name") + private String projectName; + /** + * 父订单编号 + */ + @SerializedName("parent_order_no") + private String parentOrderNo; + /** + * 配送订单编号 + */ + @SerializedName("order_no") + private String orderNo; + /** + * 下单时间 yyyy-MM-dd HH:mm:ss + */ + @SerializedName("order_time") + private String orderTime; + /** + * 订单金额 + */ + @SerializedName("order_amount") + private BigDecimal orderAmount; + /** + * 订单描述 + */ + @SerializedName("order_note") + private String orderNote; + /** + * 订单状态：0-正常；1-作废 + */ + @SerializedName("order_status") + private String orderStatus; + /** + * 配送公司账号A1 + */ + @SerializedName("account_no_a1") + private String accountNoA1; + /** + * 配送公司账号A2 + */ + @SerializedName("account_no_a2") + private String accountNoA2; + /** + * 配送公司户名 + */ + @SerializedName("account_name") + private String accountName; + /** + * 合同编号 + */ + @SerializedName("contract_no") + private String contractNo; + /** + * 合同类型：1-采购合同；2-分包合同 + */ + @SerializedName("contract_type") + private String contractType; + /** + * 甲方名称 + */ + @SerializedName("party_a_name") + private String partyAName; + /** + * 甲方证件号码 + */ + @SerializedName("party_a_id_no") + private String partyAIdNo; + /** + * 乙方名称 + */ + @SerializedName("party_b_name") + private String partyBName; + /** + * 乙方证件号码 + */ + @SerializedName("party_b_id_no") + private String partyBIdNo; + /** + * 分包公司账号A1 + */ + @SerializedName("sub_account_no_a1") + private String subAccountNoA1; + /** + * 分包公司乙方账号 + */ + @SerializedName("sub_account_no_a2") + private String subAccountNoA2; + /** + * 分包公司户名 + */ + @SerializedName("sub_account_name") + private String subAccountName; + /** + * 扣点比例 + */ + @SerializedName("divide_prop") + private BigDecimal divideProp; + /** + * 结算账号 + */ + @SerializedName("settle_account_no") + private String settleAccountNo; + /** + * 结算户名 + */ + @SerializedName("settle_account_name") + private String settleAccountName; + /** + * 结算状态：0-未结算；1-已结算；2-部分结算；8-未知；9-结算失败 + */ + @SerializedName("settle_status") + private String settleStatus; + /** + * 结算时间 yyyy-MM-dd HH:mm:ss + */ + @SerializedName("settle_time") + private String settleTime; + /** + * 已结算金额 + */ + @SerializedName("settle_amount") + private BigDecimal settleAmount; + /** + * 已扣点金额 + */ + @SerializedName("deduct_amount") + private BigDecimal deductAmount; + /** + * 已解冻金额 + */ + @SerializedName("unfreeze_amount") + private BigDecimal unfreezeAmount; + /** + * 融资账号A1 + */ + @SerializedName("finance_account_no_a1") + private String financeAccountNoA1; + /** + * 融资账号A2 + */ + @SerializedName("finance_account_no_a2") + private String financeAccountNoA2; + /** + * 融资户名 + */ + @SerializedName("finance_account_name") + private String financeAccountName; + /** + * 失效日期 yyyy-MM-dd + */ + @SerializedName("finance_invalid_date") + private String financeInvalidDate; + /** + * 融资比例 + */ + @SerializedName("finance_prop") + private BigDecimal financeProp; + /** + * 可融资额度 + */ + @SerializedName("finance_limit") + private BigDecimal financeLimit; + /** + * 已提款总额 + */ + @SerializedName("finance_amount_total") + private BigDecimal financeAmountTotal; + /** + * 融资状态：0-未融资；1-已融资；2-部分融资；8-未知；9-融资失败 + */ + @SerializedName("finance_status") + private String financeStatus; + /** + * 已还本金 + */ + @SerializedName("repay_amount_bj") + private BigDecimal repayAmountBj; + /** + * 已还利息 + */ + @SerializedName("repay_amount_lx") + private BigDecimal repayAmountLx; + /** + * 已付服务费 + */ + @SerializedName("pay_fee") + private BigDecimal payFee; + /** + * 创建时间 yyyy-MM-dd HH:mm:ss + */ + @SerializedName("create_time") + private String createTime; + /** + * 更新时间 yyyy-MM-dd HH:mm:ss + */ + @SerializedName("update_time") + private String updateTime; + + /** + * 商品清单List + */ + @SerializedName("goods_list") + private List goodsList; + /** + * 订单提款信息List + */ + @SerializedName("loan_list") + private List loanList; + /** + * 文件资料List + */ + @SerializedName("file_list") + private List fileList; + } + + @Data + public static class ArcOrderDeliveryGoodsDTO implements Serializable { + /** + * 商品编号 + */ + @SerializedName("goods_no") + private String goodsNo; + /** + * 商品名称 + */ + @SerializedName("goods_name") + private String goodsName; + /** + * 商品数量 + */ + @SerializedName("goods_quantity") + private Integer goodsQuantity; + /** + * 计量单位 + */ + @SerializedName("goods_unit") + private String goodsUnit; + /** + * 商品金额=商品数量*商品单价 + */ + @SerializedName("goods_amount") + private BigDecimal goodsAmount; + /** + * 商品描述 + */ + @SerializedName("goods_note") + private String goodsNote; + /** + * 商品状态：0-正常；1-作废 + */ + @SerializedName("goods_status") + private String goodsStatus; + /** + * 创建时间 + */ + @SerializedName("create_time") + private String createTime; + /** + * 更新时间 + */ + @SerializedName("update_time") + private String updateTime; + } + + @Data + public static class ArcOrderDeliveryLoanDTO implements Serializable { + /** + * 请求流水号 + */ + @SerializedName("req_serial_no") + private String reqSerialNo; + /** + * 系统流水号 + */ + @SerializedName("sys_serial_no") + private String sysSerialNo; + /** + * 配送订单编号 + */ + @SerializedName("order_no") + private String orderNo; + /** + * 贷款合同编号 + */ + @SerializedName("contract_no") + private String contractNo; + /** + * 贷款申请账号 + */ + @SerializedName("apply_account_no") + private String applyAccountNo; + /** + * 贷款申请户名 + */ + @SerializedName("apply_account_name") + private String applyAccountName; + /** + * 贷款账号（借据编号） + */ + @SerializedName("loan_acct_no") + private String loanAcctNo; + /** + * 贷款账号序号 + */ + @SerializedName("acct_seq_no") + 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("core_serial_no") + private String coreSerialNo; + /** + * 提款摘要 + */ + @SerializedName("loan_remark") + private String loanRemark; + /** + * 还款流水号 + */ + @SerializedName("repay_serial_no") + private String repaySerialNo; + /** + * 还款状态：0-未还款；1-已还款；2-部分还款；8-未知；9-还款失败 + */ + @SerializedName("repay_status") + private String repayStatus; + /** + * 还款失败描述 + */ + @SerializedName("repay_fail_message") + private String repayFailMessage; + /** + * 还款本金 + */ + @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; + } + + @Data + public static class ArcOrderDeliveryFileDTO implements Serializable { + /** + * 文件编号 + */ + @SerializedName("file_no") + private String fileNo; + /** + * 文件类型：32、验收单 + */ + @SerializedName("file_type") + private String fileType; + /** + * 文件说明 + */ + @SerializedName("file_note") + private String fileNote; + /** + * 创建时间 + */ + @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/ar/model/ArcOrderDeliveryQueryPageRequest.java b/scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/ar/model/ArcOrderDeliveryQueryPageRequest.java index 54be292..11f95c7 100644 --- a/scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/ar/model/ArcOrderDeliveryQueryPageRequest.java +++ b/scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/ar/model/ArcOrderDeliveryQueryPageRequest.java @@ -8,6 +8,9 @@ import lombok.EqualsAndHashCode; import lombok.ToString; import lombok.experimental.Accessors; +import java.io.Serializable; +import java.math.BigDecimal; + /** * 312306-配送订单分页查询(农都)请求参数 * @@ -22,7 +25,7 @@ import lombok.experimental.Accessors; public class ArcOrderDeliveryQueryPageRequest extends ArcBaseRequest implements ApiRequest { @SerializedName("data") - private ArcOrderDeliveryDTO data; + private RequestData data; /** * 当前页数 */ @@ -33,4 +36,78 @@ public class ArcOrderDeliveryQueryPageRequest extends ArcBaseRequest implements */ @SerializedName("current_rows") private Long currentRows; + + @Data + public static class RequestData implements Serializable { + /** + * 父订单编号 + */ + @SerializedName("parent_order_no") + private String parentOrderNo; + /** + * 配送订单编号 + */ + @SerializedName("order_no") + private String orderNo; + /** + * 订单时间-开始 yyyy-MM-dd + */ + @SerializedName("order_time_start") + private String orderTimeStart; + /** + * 订单时间-截至 yyyy-MM-dd + */ + @SerializedName("order_time_end") + private String orderTimeEnd; + /** + * 订单金额 + */ + @SerializedName("order_amount") + private BigDecimal orderAmount; + /** + * 订单状态：0-正常；1-作废 + */ + @SerializedName("order_status") + private String orderStatus; + /** + * 合同编号 + */ + @SerializedName("contract_no") + private String contractNo; + /** + * 结算账号 + */ + @SerializedName("settle_account_no") + private String settleAccountNo; + /** + * 结算户名 + */ + @SerializedName("settle_account_name") + private String settleAccountName; + /** + * 结算状态：0-未结算；1-已结算；2-部分结算；8-未知；9-结算失败 + */ + @SerializedName("settle_status") + private String settleStatus; + /** + * 融资账号A1 + */ + @SerializedName("finance_account_no_a1") + private String financeAccountNoA1; + /** + * 融资账号A2 + */ + @SerializedName("finance_account_no_a2") + private String financeAccountNoA2; + /** + * 融资户名 + */ + @SerializedName("finance_account_name") + private String financeAccountName; + /** + * 融资状态：0-未融资；1-已融资；2-部分融资；8-未知；9-融资失败 + */ + @SerializedName("finance_status") + private String financeStatus; + } } diff --git a/scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/ar/model/ArcOrderDeliveryQueryPageResponse.java b/scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/ar/model/ArcOrderDeliveryQueryPageResponse.java index c40c100..a28208d 100644 --- a/scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/ar/model/ArcOrderDeliveryQueryPageResponse.java +++ b/scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/ar/model/ArcOrderDeliveryQueryPageResponse.java @@ -7,6 +7,8 @@ import lombok.EqualsAndHashCode; import lombok.ToString; import lombok.experimental.Accessors; +import java.io.Serializable; +import java.math.BigDecimal; import java.util.List; /** @@ -22,7 +24,7 @@ import java.util.List; public class ArcOrderDeliveryQueryPageResponse extends ArcBaseResponse implements ApiResponse { @SerializedName("data") - private List data; + private List data; /** * 当前页码 */ @@ -38,4 +40,213 @@ public class ArcOrderDeliveryQueryPageResponse extends ArcBaseResponse implement */ @SerializedName("total_rows") private Long totalRows; + + @Data + public static class RequestData implements Serializable { + /** + * 项目编号 + */ + @SerializedName("project_no") + private String projectNo; + /** + * 项目名称 + */ + @SerializedName("project_name") + private String projectName; + /** + * 父订单编号 + */ + @SerializedName("parent_order_no") + private String parentOrderNo; + /** + * 配送订单编号 + */ + @SerializedName("order_no") + private String orderNo; + /** + * 下单时间 yyyy-MM-dd HH:mm:ss + */ + @SerializedName("order_time") + private String orderTime; + /** + * 订单金额 + */ + @SerializedName("order_amount") + private BigDecimal orderAmount; + /** + * 订单描述 + */ + @SerializedName("order_note") + private String orderNote; + /** + * 订单状态：0-正常；1-作废 + */ + @SerializedName("order_status") + private String orderStatus; + /** + * 配送公司账号A1 + */ + @SerializedName("account_no_a1") + private String accountNoA1; + /** + * 配送公司账号A2 + */ + @SerializedName("account_no_a2") + private String accountNoA2; + /** + * 配送公司户名 + */ + @SerializedName("account_name") + private String accountName; + /** + * 合同编号 + */ + @SerializedName("contract_no") + private String contractNo; + /** + * 合同类型：1-采购合同；2-分包合同 + */ + @SerializedName("contract_type") + private String contractType; + /** + * 甲方名称 + */ + @SerializedName("party_a_name") + private String partyAName; + /** + * 甲方证件号码 + */ + @SerializedName("party_a_id_no") + private String partyAIdNo; + /** + * 乙方名称 + */ + @SerializedName("party_b_name") + private String partyBName; + /** + * 乙方证件号码 + */ + @SerializedName("party_b_id_no") + private String partyBIdNo; + /** + * 分包公司账号A1 + */ + @SerializedName("sub_account_no_a1") + private String subAccountNoA1; + /** + * 分包公司乙方账号 + */ + @SerializedName("sub_account_no_a2") + private String subAccountNoA2; + /** + * 分包公司户名 + */ + @SerializedName("sub_account_name") + private String subAccountName; + /** + * 扣点比例 + */ + @SerializedName("divide_prop") + private BigDecimal divideProp; + /** + * 结算账号 + */ + @SerializedName("settle_account_no") + private String settleAccountNo; + /** + * 结算户名 + */ + @SerializedName("settle_account_name") + private String settleAccountName; + /** + * 结算状态：0-未结算；1-已结算；2-部分结算；8-未知；9-结算失败 + */ + @SerializedName("settle_status") + private String settleStatus; + /** + * 结算时间 yyyy-MM-dd HH:mm:ss + */ + @SerializedName("settle_time") + private String settleTime; + /** + * 已结算金额 + */ + @SerializedName("settle_amount") + private BigDecimal settleAmount; + /** + * 已扣点金额 + */ + @SerializedName("deduct_amount") + private BigDecimal deductAmount; + /** + * 已解冻金额 + */ + @SerializedName("unfreeze_amount") + private BigDecimal unfreezeAmount; + /** + * 融资账号A1 + */ + @SerializedName("finance_account_no_a1") + private String financeAccountNoA1; + /** + * 融资账号A2 + */ + @SerializedName("finance_account_no_a2") + private String financeAccountNoA2; + /** + * 融资户名 + */ + @SerializedName("finance_account_name") + private String financeAccountName; + /** + * 失效日期 yyyy-MM-dd + */ + @SerializedName("finance_invalid_date") + private String financeInvalidDate; + /** + * 融资比例 + */ + @SerializedName("finance_prop") + private BigDecimal financeProp; + /** + * 可融资额度 + */ + @SerializedName("finance_limit") + private BigDecimal financeLimit; + /** + * 已提款总额 + */ + @SerializedName("finance_amount_total") + private BigDecimal financeAmountTotal; + /** + * 融资状态：0-未融资；1-已融资；2-部分融资；8-未知；9-融资失败 + */ + @SerializedName("finance_status") + private String financeStatus; + /** + * 已还本金 + */ + @SerializedName("repay_amount_bj") + private BigDecimal repayAmountBj; + /** + * 已还利息 + */ + @SerializedName("repay_amount_lx") + private BigDecimal repayAmountLx; + /** + * 已付服务费 + */ + @SerializedName("pay_fee") + private BigDecimal payFee; + /** + * 创建时间 yyyy-MM-dd HH:mm:ss + */ + @SerializedName("create_time") + private String createTime; + /** + * 更新时间 yyyy-MM-dd HH:mm:ss + */ + @SerializedName("update_time") + private String updateTime; + } } diff --git a/scfs-api-test/src/test/java/com/czcb/scfs/api/test/service/ArcOrderDeliveryServiceTest.java b/scfs-api-test/src/test/java/com/czcb/scfs/api/test/service/ArcOrderDeliveryServiceTest.java index b7a0cff..832361a 100644 --- a/scfs-api-test/src/test/java/com/czcb/scfs/api/test/service/ArcOrderDeliveryServiceTest.java +++ b/scfs-api-test/src/test/java/com/czcb/scfs/api/test/service/ArcOrderDeliveryServiceTest.java @@ -29,7 +29,7 @@ class ArcOrderDeliveryServiceTest { request.setTransDate("2024-03-20"); request.setTransTradeTime("2024-01-02 09:11:53"); ArcOrderDeliveryQueryByNoRequest.RequestData requestData = new ArcOrderDeliveryQueryByNoRequest.RequestData(); - requestData.setOrderNo("CreditTest201"); + requestData.setOrderNo("配送订单测试20251218007"); request.setData(requestData); ArcOrderDeliveryQueryByNoResponse response = arcOrderDeliveryService.queryByNo(request); @@ -44,7 +44,7 @@ class ArcOrderDeliveryServiceTest { request.setSerialNo(UUID.randomUUID().toString().replace("-", "")); request.setTransDate("2024-03-20"); request.setTransTradeTime("2024-01-02 09:11:53"); - ArcOrderDeliveryDTO requestData = new ArcOrderDeliveryDTO(); + ArcOrderDeliveryQueryPageRequest.RequestData requestData = new ArcOrderDeliveryQueryPageRequest.RequestData(); requestData.setOrderStatus("0"); request.setData(requestData); request.setCurrentPage(2L);