From d2feb15b2431d338e15d276eb45622ab32101ffb Mon Sep 17 00:00:00 2001 From: wb2476 Date: Tue, 30 Jul 2024 14:17:02 +0800 Subject: [PATCH] =?UTF-8?q?feat=EF=BC=9A=E6=B7=BB=E5=8A=A0=E7=B1=B3?= =?UTF-8?q?=E9=98=B3=E8=9E=8D=E8=B5=84=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../miyang => }/entpay/EntPayService.java | 5 +- .../entpay/model/CommonAgrtPayRequest.java | 2 +- .../entpay/model/CommonAgrtPayResponse.java | 2 +- .../entpay/model/EntPayAgrtCreateRequest.java | 2 +- .../model/EntPayAgrtCreateResponse.java | 2 +- .../entpay/model/EntPayAgrtDelRequest.java | 2 +- .../entpay/model/EntPayAgrtDelResponse.java | 2 +- .../model/EntPayAgrtQueryListRequest.java | 2 +- .../model/EntPayAgrtQueryListResponse.java | 2 +- .../model/EntPayAgrtWithholdRequest.java | 2 +- .../model/EntPayAgrtWithholdResponse.java | 2 +- .../v2/order/TradeOrdersSltService.java | 44 +++++ .../model/TradeOrdersSltCreateRequest.java | 151 +++++++++++++++ .../model/TradeOrdersSltCreateResponse.java | 46 +++++ .../model/TradeOrdersSltSettleRequest.java | 69 +++++++ .../model/TradeOrdersSltSettleResponse.java | 46 +++++ .../miyang => }/waybill/WayBillService.java | 42 ++++- .../model/WayBillBackFundSettleRequest.java | 116 ++++++++++++ .../model/WayBillBackFundSettleResponse.java | 46 +++++ .../model/WayBillCreditPayBatchRequest.java | 173 ++++++++++++++++++ .../model/WayBillCreditPayBatchResponse.java | 46 +++++ .../model/WayBillCreditPayRequest.java | 157 ++++++++++++++++ .../model/WayBillCreditPayResponse.java | 46 +++++ .../model/WayBillProjectCreateRequest.java | 2 +- .../model/WayBillProjectCreateResponse.java | 2 +- .../model/WayBillProjectDelRequest.java | 2 +- .../model/WayBillProjectDelResponse.java | 2 +- .../model/WayBillProjectQueryRequest.java | 2 +- .../model/WayBillProjectQueryResponse.java | 2 +- .../waybill/model/WayBillQueryRequest.java | 2 +- .../waybill/model/WayBillQueryResponse.java | 2 +- .../v2/waybill/model/WayBillRepayRequest.java | 90 +++++++++ .../waybill/model/WayBillRepayResponse.java | 46 +++++ .../waybill/model/WayBillSettleRequest.java | 2 +- .../waybill/model/WayBillSettleResponse.java | 2 +- .../waybill/model/WaybillCancelRequest.java | 2 +- .../waybill/model/WaybillCancelResponse.java | 2 +- .../waybill/model/WaybillCreateRequest.java | 2 +- .../waybill/model/WaybillCreateResponse.java | 2 +- .../boot/starter/ScfsAutoConfiguration.java | 14 +- .../api/test/service/EntPayServiceTest.java | 4 +- 41 files changed, 1157 insertions(+), 32 deletions(-) rename scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/{customization/miyang => }/entpay/EntPayService.java (94%) rename scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/{customization/miyang => }/entpay/model/CommonAgrtPayRequest.java (96%) rename scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/{customization/miyang => }/entpay/model/CommonAgrtPayResponse.java (92%) rename scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/{customization/miyang => }/entpay/model/EntPayAgrtCreateRequest.java (97%) rename scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/{customization/miyang => }/entpay/model/EntPayAgrtCreateResponse.java (92%) rename scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/{customization/miyang => }/entpay/model/EntPayAgrtDelRequest.java (93%) rename scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/{customization/miyang => }/entpay/model/EntPayAgrtDelResponse.java (92%) rename scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/{customization/miyang => }/entpay/model/EntPayAgrtQueryListRequest.java (95%) rename scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/{customization/miyang => }/entpay/model/EntPayAgrtQueryListResponse.java (97%) rename scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/{customization/miyang => }/entpay/model/EntPayAgrtWithholdRequest.java (95%) rename scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/{customization/miyang => }/entpay/model/EntPayAgrtWithholdResponse.java (92%) create mode 100644 scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/order/TradeOrdersSltService.java create mode 100644 scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/order/model/TradeOrdersSltCreateRequest.java create mode 100644 scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/order/model/TradeOrdersSltCreateResponse.java create mode 100644 scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/order/model/TradeOrdersSltSettleRequest.java create mode 100644 scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/order/model/TradeOrdersSltSettleResponse.java rename scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/{customization/miyang => }/waybill/WayBillService.java (64%) create mode 100644 scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/waybill/model/WayBillBackFundSettleRequest.java create mode 100644 scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/waybill/model/WayBillBackFundSettleResponse.java create mode 100644 scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/waybill/model/WayBillCreditPayBatchRequest.java create mode 100644 scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/waybill/model/WayBillCreditPayBatchResponse.java create mode 100644 scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/waybill/model/WayBillCreditPayRequest.java create mode 100644 scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/waybill/model/WayBillCreditPayResponse.java rename scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/{customization/miyang => }/waybill/model/WayBillProjectCreateRequest.java (95%) rename scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/{customization/miyang => }/waybill/model/WayBillProjectCreateResponse.java (92%) rename scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/{customization/miyang => }/waybill/model/WayBillProjectDelRequest.java (93%) rename scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/{customization/miyang => }/waybill/model/WayBillProjectDelResponse.java (92%) rename scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/{customization/miyang => }/waybill/model/WayBillProjectQueryRequest.java (93%) rename scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/{customization/miyang => }/waybill/model/WayBillProjectQueryResponse.java (96%) rename scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/{customization/miyang => }/waybill/model/WayBillQueryRequest.java (93%) rename scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/{customization/miyang => }/waybill/model/WayBillQueryResponse.java (99%) create mode 100644 scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/waybill/model/WayBillRepayRequest.java create mode 100644 scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/waybill/model/WayBillRepayResponse.java rename scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/{customization/miyang => }/waybill/model/WayBillSettleRequest.java (95%) rename scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/{customization/miyang => }/waybill/model/WayBillSettleResponse.java (92%) rename scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/{customization/miyang => }/waybill/model/WaybillCancelRequest.java (93%) rename scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/{customization/miyang => }/waybill/model/WaybillCancelResponse.java (92%) rename scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/{customization/miyang => }/waybill/model/WaybillCreateRequest.java (98%) rename scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/{customization/miyang => }/waybill/model/WaybillCreateResponse.java (92%) diff --git a/scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/customization/miyang/entpay/EntPayService.java b/scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/entpay/EntPayService.java similarity index 94% rename from scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/customization/miyang/entpay/EntPayService.java rename to scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/entpay/EntPayService.java index 9b3c874..09add5a 100644 --- a/scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/customization/miyang/entpay/EntPayService.java +++ b/scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/entpay/EntPayService.java @@ -1,9 +1,9 @@ -package com.czcb.scfs.api.service.v2.customization.miyang.entpay; +package com.czcb.scfs.api.service.v2.entpay; 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.customization.miyang.entpay.model.*; +import com.czcb.scfs.api.service.v2.entpay.model.*; /** * 米阳受托支付功能 @@ -12,6 +12,7 @@ import com.czcb.scfs.api.service.v2.customization.miyang.entpay.model.*; * @since 2024-07-29 */ public class EntPayService { + private final ApiClient apiClient; public EntPayService(ApiClient apiClient) { diff --git a/scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/customization/miyang/entpay/model/CommonAgrtPayRequest.java b/scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/entpay/model/CommonAgrtPayRequest.java similarity index 96% rename from scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/customization/miyang/entpay/model/CommonAgrtPayRequest.java rename to scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/entpay/model/CommonAgrtPayRequest.java index ffe3a03..132e5a7 100644 --- a/scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/customization/miyang/entpay/model/CommonAgrtPayRequest.java +++ b/scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/entpay/model/CommonAgrtPayRequest.java @@ -1,4 +1,4 @@ -package com.czcb.scfs.api.service.v2.customization.miyang.entpay.model; +package com.czcb.scfs.api.service.v2.entpay.model; import com.czcb.scfs.api.core.ApiRequest; import com.czcb.scfs.api.core.agrs.TransType; diff --git a/scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/customization/miyang/entpay/model/CommonAgrtPayResponse.java b/scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/entpay/model/CommonAgrtPayResponse.java similarity index 92% rename from scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/customization/miyang/entpay/model/CommonAgrtPayResponse.java rename to scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/entpay/model/CommonAgrtPayResponse.java index 3fcf94b..741451d 100644 --- a/scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/customization/miyang/entpay/model/CommonAgrtPayResponse.java +++ b/scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/entpay/model/CommonAgrtPayResponse.java @@ -1,4 +1,4 @@ -package com.czcb.scfs.api.service.v2.customization.miyang.entpay.model; +package com.czcb.scfs.api.service.v2.entpay.model; import com.czcb.scfs.api.core.ApiResponse; import com.google.gson.annotations.SerializedName; diff --git a/scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/customization/miyang/entpay/model/EntPayAgrtCreateRequest.java b/scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/entpay/model/EntPayAgrtCreateRequest.java similarity index 97% rename from scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/customization/miyang/entpay/model/EntPayAgrtCreateRequest.java rename to scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/entpay/model/EntPayAgrtCreateRequest.java index 9579153..1f89528 100644 --- a/scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/customization/miyang/entpay/model/EntPayAgrtCreateRequest.java +++ b/scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/entpay/model/EntPayAgrtCreateRequest.java @@ -1,4 +1,4 @@ -package com.czcb.scfs.api.service.v2.customization.miyang.entpay.model; +package com.czcb.scfs.api.service.v2.entpay.model; import com.czcb.scfs.api.core.ApiRequest; import com.czcb.scfs.api.core.agrs.TransType; diff --git a/scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/customization/miyang/entpay/model/EntPayAgrtCreateResponse.java b/scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/entpay/model/EntPayAgrtCreateResponse.java similarity index 92% rename from scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/customization/miyang/entpay/model/EntPayAgrtCreateResponse.java rename to scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/entpay/model/EntPayAgrtCreateResponse.java index 42912e7..86f1d34 100644 --- a/scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/customization/miyang/entpay/model/EntPayAgrtCreateResponse.java +++ b/scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/entpay/model/EntPayAgrtCreateResponse.java @@ -1,4 +1,4 @@ -package com.czcb.scfs.api.service.v2.customization.miyang.entpay.model; +package com.czcb.scfs.api.service.v2.entpay.model; import com.czcb.scfs.api.core.ApiResponse; import com.google.gson.annotations.SerializedName; diff --git a/scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/customization/miyang/entpay/model/EntPayAgrtDelRequest.java b/scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/entpay/model/EntPayAgrtDelRequest.java similarity index 93% rename from scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/customization/miyang/entpay/model/EntPayAgrtDelRequest.java rename to scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/entpay/model/EntPayAgrtDelRequest.java index 075539a..48872bb 100644 --- a/scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/customization/miyang/entpay/model/EntPayAgrtDelRequest.java +++ b/scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/entpay/model/EntPayAgrtDelRequest.java @@ -1,4 +1,4 @@ -package com.czcb.scfs.api.service.v2.customization.miyang.entpay.model; +package com.czcb.scfs.api.service.v2.entpay.model; import com.czcb.scfs.api.core.ApiRequest; import com.czcb.scfs.api.core.agrs.TransType; diff --git a/scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/customization/miyang/entpay/model/EntPayAgrtDelResponse.java b/scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/entpay/model/EntPayAgrtDelResponse.java similarity index 92% rename from scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/customization/miyang/entpay/model/EntPayAgrtDelResponse.java rename to scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/entpay/model/EntPayAgrtDelResponse.java index 3083abb..ae5ddae 100644 --- a/scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/customization/miyang/entpay/model/EntPayAgrtDelResponse.java +++ b/scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/entpay/model/EntPayAgrtDelResponse.java @@ -1,4 +1,4 @@ -package com.czcb.scfs.api.service.v2.customization.miyang.entpay.model; +package com.czcb.scfs.api.service.v2.entpay.model; import com.czcb.scfs.api.core.ApiResponse; import com.google.gson.annotations.SerializedName; diff --git a/scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/customization/miyang/entpay/model/EntPayAgrtQueryListRequest.java b/scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/entpay/model/EntPayAgrtQueryListRequest.java similarity index 95% rename from scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/customization/miyang/entpay/model/EntPayAgrtQueryListRequest.java rename to scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/entpay/model/EntPayAgrtQueryListRequest.java index 90a3258..c3797bb 100644 --- a/scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/customization/miyang/entpay/model/EntPayAgrtQueryListRequest.java +++ b/scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/entpay/model/EntPayAgrtQueryListRequest.java @@ -1,4 +1,4 @@ -package com.czcb.scfs.api.service.v2.customization.miyang.entpay.model; +package com.czcb.scfs.api.service.v2.entpay.model; import com.czcb.scfs.api.core.ApiRequest; import com.czcb.scfs.api.core.agrs.TransType; diff --git a/scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/customization/miyang/entpay/model/EntPayAgrtQueryListResponse.java b/scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/entpay/model/EntPayAgrtQueryListResponse.java similarity index 97% rename from scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/customization/miyang/entpay/model/EntPayAgrtQueryListResponse.java rename to scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/entpay/model/EntPayAgrtQueryListResponse.java index fac8546..73e1891 100644 --- a/scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/customization/miyang/entpay/model/EntPayAgrtQueryListResponse.java +++ b/scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/entpay/model/EntPayAgrtQueryListResponse.java @@ -1,4 +1,4 @@ -package com.czcb.scfs.api.service.v2.customization.miyang.entpay.model; +package com.czcb.scfs.api.service.v2.entpay.model; import com.czcb.scfs.api.core.ApiResponse; import com.google.gson.annotations.SerializedName; diff --git a/scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/customization/miyang/entpay/model/EntPayAgrtWithholdRequest.java b/scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/entpay/model/EntPayAgrtWithholdRequest.java similarity index 95% rename from scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/customization/miyang/entpay/model/EntPayAgrtWithholdRequest.java rename to scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/entpay/model/EntPayAgrtWithholdRequest.java index 383051c..dceb72e 100644 --- a/scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/customization/miyang/entpay/model/EntPayAgrtWithholdRequest.java +++ b/scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/entpay/model/EntPayAgrtWithholdRequest.java @@ -1,4 +1,4 @@ -package com.czcb.scfs.api.service.v2.customization.miyang.entpay.model; +package com.czcb.scfs.api.service.v2.entpay.model; import com.czcb.scfs.api.core.ApiRequest; import com.czcb.scfs.api.core.agrs.TransType; diff --git a/scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/customization/miyang/entpay/model/EntPayAgrtWithholdResponse.java b/scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/entpay/model/EntPayAgrtWithholdResponse.java similarity index 92% rename from scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/customization/miyang/entpay/model/EntPayAgrtWithholdResponse.java rename to scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/entpay/model/EntPayAgrtWithholdResponse.java index 68ad729..12dbbe4 100644 --- a/scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/customization/miyang/entpay/model/EntPayAgrtWithholdResponse.java +++ b/scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/entpay/model/EntPayAgrtWithholdResponse.java @@ -1,4 +1,4 @@ -package com.czcb.scfs.api.service.v2.customization.miyang.entpay.model; +package com.czcb.scfs.api.service.v2.entpay.model; import com.czcb.scfs.api.core.ApiResponse; import com.google.gson.annotations.SerializedName; diff --git a/scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/order/TradeOrdersSltService.java b/scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/order/TradeOrdersSltService.java new file mode 100644 index 0000000..63c59d3 --- /dev/null +++ b/scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/order/TradeOrdersSltService.java @@ -0,0 +1,44 @@ +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.TradeOrdersSltCreateRequest; +import com.czcb.scfs.api.service.v2.order.model.TradeOrdersSltCreateResponse; +import com.czcb.scfs.api.service.v2.order.model.TradeOrdersSltSettleRequest; +import com.czcb.scfs.api.service.v2.order.model.TradeOrdersSltSettleResponse; + +/** + * 米阳贸易订单功能 + * + * @author H.T + * @since 2024-07-30 + */ +public class TradeOrdersSltService { + + private final ApiClient apiClient; + + public TradeOrdersSltService(ApiClient apiClient) { + this.apiClient = apiClient; + } + + /** + * 300607-贸易订单登记 + */ + public TradeOrdersSltCreateResponse create(TradeOrdersSltCreateRequest request) { + String url = "/trade-orders-slt/create"; + HttpResponse httpResponse = apiClient.post(url, HttpHeaders.apiVersionV2(), + request.toJsonRequest(), TradeOrdersSltCreateResponse.class); + return httpResponse.getServiceResponse(); + } + + /** + * 300608-贸易订单-回款清算 + */ + public TradeOrdersSltSettleResponse settle(TradeOrdersSltSettleRequest request) { + String url = "/trade-orders-slt/settle"; + HttpResponse httpResponse = apiClient.post(url, HttpHeaders.apiVersionV2(), + request.toJsonRequest(), TradeOrdersSltSettleResponse.class); + return httpResponse.getServiceResponse(); + } +} diff --git a/scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/order/model/TradeOrdersSltCreateRequest.java b/scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/order/model/TradeOrdersSltCreateRequest.java new file mode 100644 index 0000000..bf62f25 --- /dev/null +++ b/scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/order/model/TradeOrdersSltCreateRequest.java @@ -0,0 +1,151 @@ +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.io.Serializable; +import java.math.BigDecimal; +import java.util.List; + +/** + * 300607-贸易订单登记 + * + * @author H.T + * @since 2024-07-30 + */ +@Data +@Accessors(chain = true) +@TransType("300607") +public class TradeOrdersSltCreateRequest implements ApiRequest { + /** + * 渠道编号 + */ + @SerializedName("channel_no") + private String channelNo; + + /** + * 应用编号 + */ + @SerializedName("app_no") + private String appNo; + + /** + * 流水号 + */ + @SerializedName("serial_no") + private String serialNo; + + /** + * 操作日期 yyyy-MM-dd + */ + @SerializedName("trans_date") + private String transDate; + + /** + * 操作时间 yyyy-MM-dd HH:mm:ss + */ + @SerializedName("trans_tradetime") + private String transTradeTime; + + /** + * 订单编号 + */ + @SerializedName("order_no") + private String orderNo; + + /** + * 订单类型 9、采购订单 + */ + @SerializedName("order_type") + private String orderType; + + /** + * 下单时间 + */ + @SerializedName("order_time") + private String orderTime; + + /** + * 订单金额 + */ + @SerializedName("order_amount") + private BigDecimal orderAmount; + + /** + * 付款账户账号（贸易公司A1/服务公司A1） + */ + @SerializedName("account_no") + private String accountNo; + + /** + * 付款账户户名（贸易公司A1/服务公司A1） + */ + @SerializedName("account_name") + private String accountName; + + /** + * 收款账户账号（上游公司账号） + */ + @SerializedName("opp_account_no") + private String oppAccountNo; + + /** + * 收款账户户名（上游公司户名） + */ + @SerializedName("opp_account_name") + private String oppAccountName; + + /** + * 项目编号 + */ + @SerializedName("project_no") + private String projectNo; + + /** + * 项目名称 + */ + @SerializedName("project_name") + private String projectName; + + /** + * 摘要 + */ + @SerializedName("remark") + private String remark; + + /** + * 分润信息List（平台服务费收取） + */ + @SerializedName("settleList") + private List settleList; + + @Data + public static class SettleAccList implements Serializable { + /** + * 收款账户账号 + */ + @SerializedName("settle_account_no") + private String settleAccountNo; + + /** + * 收款账户户名 + */ + @SerializedName("settle_account_name") + private String settleAccountName; + + /** + * 收款金额 + */ + @SerializedName("settle_amount") + private BigDecimal settleAmount; + + /** + * 收款说明 + */ + @SerializedName("settle_note") + private String settleNote; + } +} diff --git a/scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/order/model/TradeOrdersSltCreateResponse.java b/scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/order/model/TradeOrdersSltCreateResponse.java new file mode 100644 index 0000000..8259440 --- /dev/null +++ b/scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/order/model/TradeOrdersSltCreateResponse.java @@ -0,0 +1,46 @@ +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; + +/** + * 300607-贸易订单登记 + * + * @author H.T + * @since 2024-07-30 + */ +@Data +@Accessors(chain = true) +public class TradeOrdersSltCreateResponse 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; +} \ No newline at end of file diff --git a/scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/order/model/TradeOrdersSltSettleRequest.java b/scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/order/model/TradeOrdersSltSettleRequest.java new file mode 100644 index 0000000..d90791a --- /dev/null +++ b/scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/order/model/TradeOrdersSltSettleRequest.java @@ -0,0 +1,69 @@ +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; + +/** + * 300608-贸易订单-回款清算 + * + * @author H.T + * @since 2024-07-30 + */ +@Data +@Accessors(chain = true) +@TransType("300608") +public class TradeOrdersSltSettleRequest implements ApiRequest { + /** + * 渠道编号 + */ + @SerializedName("channel_no") + private String channelNo; + + /** + * 应用编号 + */ + @SerializedName("app_no") + private String appNo; + + /** + * 流水号 + */ + @SerializedName("serial_no") + private String serialNo; + + /** + * 操作日期 yyyy-MM-dd + */ + @SerializedName("trans_date") + private String transDate; + + /** + * 操作时间 yyyy-MM-dd HH:mm:ss + */ + @SerializedName("trans_tradetime") + private String transTradeTime; + + + + + private String order_no;//订单编号 + + private String account_no;//付款账户账号（贸易公司A2/服务公司A2） + + private String account_name;//付款账户户名（贸易公司A2/服务公司A2） + + private BigDecimal pay_amount;//支付金额=收款金额+sum（分润金额） 大于0 + + private String opp_account_no;//收款账户账号（贸易公司A1/服务公司A1） + + private String opp_account_name;//收款账户户名（贸易公司A1/服务公司A1） + + private BigDecimal receive_amount;//收款金额 大于等于0 + + private String remark;//摘要 +} diff --git a/scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/order/model/TradeOrdersSltSettleResponse.java b/scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/order/model/TradeOrdersSltSettleResponse.java new file mode 100644 index 0000000..b99fa7f --- /dev/null +++ b/scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/order/model/TradeOrdersSltSettleResponse.java @@ -0,0 +1,46 @@ +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; + +/** + * 300608-贸易订单-回款清算 + * + * @author H.T + * @since 2024-07-30 + */ +@Data +@Accessors(chain = true) +public class TradeOrdersSltSettleResponse 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; +} \ No newline at end of file diff --git a/scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/customization/miyang/waybill/WayBillService.java b/scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/waybill/WayBillService.java similarity index 64% rename from scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/customization/miyang/waybill/WayBillService.java rename to scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/waybill/WayBillService.java index 4bf8a2b..b355729 100644 --- a/scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/customization/miyang/waybill/WayBillService.java +++ b/scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/waybill/WayBillService.java @@ -1,9 +1,9 @@ -package com.czcb.scfs.api.service.v2.customization.miyang.waybill; +package com.czcb.scfs.api.service.v2.waybill; 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.customization.miyang.waybill.model.*; +import com.czcb.scfs.api.service.v2.waybill.model.*; /** * 米阳运单功能 @@ -89,5 +89,43 @@ public class WayBillService { return httpResponse.getServiceResponse(); } + /** + * 300511-提前结费 + */ + public WayBillCreditPayResponse creditPay(WayBillCreditPayRequest request) { + String url = "/waybill/credit-pay"; + HttpResponse httpResponse = apiClient.post(url, HttpHeaders.apiVersionV2(), + request.toJsonRequest(), WayBillCreditPayResponse.class); + return httpResponse.getServiceResponse(); + } + /** + * 300512-提前结费批量 + */ + public WayBillCreditPayBatchResponse creditPayBatch(WayBillCreditPayBatchRequest request) { + String url = "/waybill/credit-pay-batch"; + HttpResponse httpResponse = apiClient.post(url, HttpHeaders.apiVersionV2(), + request.toJsonRequest(), WayBillCreditPayBatchResponse.class); + return httpResponse.getServiceResponse(); + } + + /** + * 300513-贷款还款 + */ + public WayBillRepayResponse repay(WayBillRepayRequest request) { + String url = "/waybill/repay"; + HttpResponse httpResponse = apiClient.post(url, HttpHeaders.apiVersionV2(), + request.toJsonRequest(), WayBillRepayResponse.class); + return httpResponse.getServiceResponse(); + } + + /** + * 300514-回款清分 + */ + public WayBillBackFundSettleResponse backFundSettle(WayBillBackFundSettleRequest request) { + String url = "/waybill/back-fund-settle"; + HttpResponse httpResponse = apiClient.post(url, HttpHeaders.apiVersionV2(), + request.toJsonRequest(), WayBillBackFundSettleResponse.class); + return httpResponse.getServiceResponse(); + } } diff --git a/scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/waybill/model/WayBillBackFundSettleRequest.java b/scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/waybill/model/WayBillBackFundSettleRequest.java new file mode 100644 index 0000000..7c74b3b --- /dev/null +++ b/scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/waybill/model/WayBillBackFundSettleRequest.java @@ -0,0 +1,116 @@ +package com.czcb.scfs.api.service.v2.waybill.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; + +/** + * 300514-回款清分 + * + * @author H.T + * @since 2024-07-30 + */ +@Data +@Accessors(chain = true) +@TransType("300514") +public class WayBillBackFundSettleRequest implements ApiRequest { + /** + * 渠道编号 + */ + @SerializedName("channel_no") + private String channelNo; + + /** + * 应用编号 + */ + @SerializedName("app_no") + private String appNo; + + /** + * 流水号 + */ + @SerializedName("serial_no") + private String serialNo; + + /** + * 操作日期 yyyy-MM-dd + */ + @SerializedName("trans_date") + private String transDate; + + /** + * 操作时间 yyyy-MM-dd HH:mm:ss + */ + @SerializedName("trans_tradetime") + private String transTradeTime; + + /** + * 付款账号（分包方A2账号） + */ + @SerializedName("account_no") + private String accountNo; + + /** + * 付款户名（分包方A2户名） + */ + @SerializedName("account_name") + private String accountName; + + /** + * 付款金额 + */ + @SerializedName("pay_amount") + private BigDecimal payAmount; + + /** + * 收款账号（分包方A1账号） + */ + @SerializedName("opp_account_no") + private String oppAccountNo; + + /** + * 收款户名（分包方A1户名） + */ + @SerializedName("opp_account_name") + private String oppAccountName; + + /** + * 收款金额（分包方分润金额） + */ + @SerializedName("receive_amount") + private BigDecimal receiveAmount; + + /** + * 收款账号1（米阳A2账号） + */ + @SerializedName("opp_account_no_1") + private String oppAccountNo1; + + /** + * 收款户名1（米阳A2户名） + */ + @SerializedName("opp_account_name_1") + private String oppAccountName1; + + /** + * 收款金额1（米阳回款金额） + */ + @SerializedName("receive_amount_1") + private BigDecimal receiveAmount1; + + /** + * 验证码，短信验证码（收款账户对应的手机号接收的验证码）短信类型：9，短信模版编号：101311 + */ + @SerializedName("app_no") + private String verifyCode; + + /** + * 摘要 + */ + @SerializedName("remork") + private String remark; +} diff --git a/scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/waybill/model/WayBillBackFundSettleResponse.java b/scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/waybill/model/WayBillBackFundSettleResponse.java new file mode 100644 index 0000000..ce6b1d5 --- /dev/null +++ b/scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/waybill/model/WayBillBackFundSettleResponse.java @@ -0,0 +1,46 @@ +package com.czcb.scfs.api.service.v2.waybill.model; + +import com.czcb.scfs.api.core.ApiResponse; +import com.google.gson.annotations.SerializedName; +import lombok.Data; +import lombok.experimental.Accessors; + +/** + * 300514-回款清分 + * + * @author H.T + * @since 2024-07-30 + */ +@Data +@Accessors(chain = true) +public class WayBillBackFundSettleResponse 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; +} \ No newline at end of file diff --git a/scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/waybill/model/WayBillCreditPayBatchRequest.java b/scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/waybill/model/WayBillCreditPayBatchRequest.java new file mode 100644 index 0000000..2dffd6c --- /dev/null +++ b/scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/waybill/model/WayBillCreditPayBatchRequest.java @@ -0,0 +1,173 @@ +package com.czcb.scfs.api.service.v2.waybill.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.io.Serializable; +import java.math.BigDecimal; +import java.util.List; + +/** + * 300512-提前结费批量 + * + * @author H.T + * @since 2024-07-30 + */ +@Data +@Accessors(chain = true) +@TransType("300512") +public class WayBillCreditPayBatchRequest implements ApiRequest { + /** + * 渠道编号 + */ + @SerializedName("channel_no") + private String channelNo; + + /** + * 应用编号 + */ + @SerializedName("app_no") + private String appNo; + + /** + * 流水号 + */ + @SerializedName("serial_no") + private String serialNo; + + /** + * 操作日期 yyyy-MM-dd + */ + @SerializedName("trans_date") + private String transDate; + + /** + * 操作时间 yyyy-MM-dd HH:mm:ss + */ + @SerializedName("trans_tradetime") + private String transTradeTime; + + /** + * 运单信息List + */ + @SerializedName("order_list") + private List orderList; + + /** + * 产品编号，贷款产品ID + */ + @SerializedName("product_id") + private String productId; + + /** + * 合同编号 + */ + @SerializedName("contract_no") + private String contractNo; + + /** + * 借款期限 + */ + @SerializedName("receipt_period") + private String receiptPeriod; + + /** + * 支付时间 + */ + @SerializedName("pay_time") + private String payTime; + + /** + * 提前结费金额（收款金额2总和） + */ + @SerializedName("pay_amount") + private BigDecimal payAmount; + + /** + * 收款账户账号（车队长A1，贷款申请账号） + */ + @SerializedName("opp_account_no") + private String oppAccountNo; + + /** + * 收款账户户名（车队长A1，贷款申请户名） + */ + @SerializedName("opp_account_name") + private String oppAccountName; + + /** + * 验证码，短信验证码（收款账户对应的手机号接收的验证码）短信类型：9，短信模版编号：101309 + */ + @SerializedName("verify_code") + private String verifyCode; + + /** + * 摘要 + */ + @SerializedName("remork") + private String remark; + + /** + * 受托支付账号(米阳A1) + */ + @SerializedName("st_account_no") + private String stAccountNo; + + /** + * 受托支付户名(米阳A1) + */ + @SerializedName("st_account_name") + private String stAccountName; + + /** + * 受托支付金额(卸土费) + */ + @SerializedName("st_pay_amount") + private BigDecimal stPayAmount; + + /** + * 商户资料信息 + */ + @SerializedName("file_list") + private List fileList; + + + @Data + public static class WayOrder implements Serializable { + /** + * 运单编号 + */ + @SerializedName("order_no") + private String orderNo; + + /** + * 项目编号 + */ + @SerializedName("project_no") + private String projectNo; + + /** + * 收款金额2（车队长应收金额） + */ + @SerializedName("opp2_amount") + private BigDecimal opp2Amount; + } + + @Data + public static class FileList implements Serializable { + /** + * 文件编号 + */ + @SerializedName("file_no") + private String fileNo; + + /** + * 文件类型 + */ + @SerializedName("file_type") + private String fileType; + } +} diff --git a/scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/waybill/model/WayBillCreditPayBatchResponse.java b/scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/waybill/model/WayBillCreditPayBatchResponse.java new file mode 100644 index 0000000..be2e466 --- /dev/null +++ b/scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/waybill/model/WayBillCreditPayBatchResponse.java @@ -0,0 +1,46 @@ +package com.czcb.scfs.api.service.v2.waybill.model; + +import com.czcb.scfs.api.core.ApiResponse; +import com.google.gson.annotations.SerializedName; +import lombok.Data; +import lombok.experimental.Accessors; + +/** + * 300512-提前结费批量 + * + * @author H.T + * @since 2024-07-30 + */ +@Data +@Accessors(chain = true) +public class WayBillCreditPayBatchResponse 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; +} diff --git a/scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/waybill/model/WayBillCreditPayRequest.java b/scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/waybill/model/WayBillCreditPayRequest.java new file mode 100644 index 0000000..2542a36 --- /dev/null +++ b/scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/waybill/model/WayBillCreditPayRequest.java @@ -0,0 +1,157 @@ +package com.czcb.scfs.api.service.v2.waybill.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.io.Serializable; +import java.math.BigDecimal; +import java.util.List; + +/** + * 300511-提前结费 + * + * @author H.T + * @since 2024-07-30 + */ +@Data +@Accessors(chain = true) +@TransType("300511") +public class WayBillCreditPayRequest implements ApiRequest { + /** + * 渠道编号 + */ + @SerializedName("channel_no") + private String channelNo; + + /** + * 应用编号 + */ + @SerializedName("app_no") + private String appNo; + + /** + * 流水号 + */ + @SerializedName("serial_no") + private String serialNo; + + /** + * 操作日期 yyyy-MM-dd + */ + @SerializedName("trans_date") + private String transDate; + + /** + * 操作时间 yyyy-MM-dd HH:mm:ss + */ + @SerializedName("trans_tradetime") + private String transTradeTime; + + /** + * 运单编号 + */ + @SerializedName("order_no") + private String orderNo; + + /** + * 项目编号 + */ + @SerializedName("project_no") + private String projectNo; + + /** + * 产品编号，贷款产品ID + */ + @SerializedName("product_id") + private String productId; + + /** + * 合同编号 + */ + @SerializedName("contract_no") + private String contractNo; + + /** + * 借款期限 + */ + @SerializedName("receipt_period") + private String receiptPeriod; + + /** + * 支付时间 + */ + @SerializedName("pay_time") + private String payTime; + + /** + * 提前结费金额（收款金额2总和） + */ + @SerializedName("pay_amount") + private BigDecimal payAmount; + + /** + * 收款账户账号（车队长A1，贷款申请账号） + */ + @SerializedName("opp_account_no") + private String oppAccountNo; + + /** + * 收款账户户名（车队长A1，贷款申请户名） + */ + @SerializedName("opp_account_name") + private String oppAccountName; + + /** + * 验证码，短信验证码（收款账户对应的手机号接收的验证码）短信类型：9，短信模版编号：101309 + */ + @SerializedName("verify_code") + private String verifyCode; + + /** + * 摘要 + */ + @SerializedName("remork") + private String remark; + + /** + * 受托支付账号(米阳A1) + */ + @SerializedName("st_account_no") + private String stAccountNo; + + /** + * 受托支付户名(米阳A1) + */ + @SerializedName("st_account_name") + private String stAccountName; + + /** + * 受托支付金额(卸土费) + */ + @SerializedName("st_pay_amount") + private BigDecimal stPayAmount; + + /** + * 商户资料信息 + */ + @SerializedName("file_list") + private List fileList; + + @Data + public static class FileList implements Serializable { + /** + * 文件编号 + */ + @SerializedName("file_no") + private String fileNo; + + /** + * 文件类型 + */ + @SerializedName("file_type") + private String fileType; + } +} diff --git a/scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/waybill/model/WayBillCreditPayResponse.java b/scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/waybill/model/WayBillCreditPayResponse.java new file mode 100644 index 0000000..d31762a --- /dev/null +++ b/scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/waybill/model/WayBillCreditPayResponse.java @@ -0,0 +1,46 @@ +package com.czcb.scfs.api.service.v2.waybill.model; + +import com.czcb.scfs.api.core.ApiResponse; +import com.google.gson.annotations.SerializedName; +import lombok.Data; +import lombok.experimental.Accessors; + +/** + * 300511-提前结费 + * + * @author H.T + * @since 2024-07-30 + */ +@Data +@Accessors(chain = true) +public class WayBillCreditPayResponse 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; +} diff --git a/scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/customization/miyang/waybill/model/WayBillProjectCreateRequest.java b/scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/waybill/model/WayBillProjectCreateRequest.java similarity index 95% rename from scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/customization/miyang/waybill/model/WayBillProjectCreateRequest.java rename to scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/waybill/model/WayBillProjectCreateRequest.java index fcfcbd9..2580e96 100644 --- a/scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/customization/miyang/waybill/model/WayBillProjectCreateRequest.java +++ b/scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/waybill/model/WayBillProjectCreateRequest.java @@ -1,4 +1,4 @@ -package com.czcb.scfs.api.service.v2.customization.miyang.waybill.model; +package com.czcb.scfs.api.service.v2.waybill.model; import com.czcb.scfs.api.core.ApiRequest; import com.czcb.scfs.api.core.agrs.TransType; diff --git a/scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/customization/miyang/waybill/model/WayBillProjectCreateResponse.java b/scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/waybill/model/WayBillProjectCreateResponse.java similarity index 92% rename from scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/customization/miyang/waybill/model/WayBillProjectCreateResponse.java rename to scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/waybill/model/WayBillProjectCreateResponse.java index fd4b5cd..10c7ae9 100644 --- a/scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/customization/miyang/waybill/model/WayBillProjectCreateResponse.java +++ b/scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/waybill/model/WayBillProjectCreateResponse.java @@ -1,4 +1,4 @@ -package com.czcb.scfs.api.service.v2.customization.miyang.waybill.model; +package com.czcb.scfs.api.service.v2.waybill.model; import com.czcb.scfs.api.core.ApiResponse; import com.google.gson.annotations.SerializedName; diff --git a/scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/customization/miyang/waybill/model/WayBillProjectDelRequest.java b/scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/waybill/model/WayBillProjectDelRequest.java similarity index 93% rename from scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/customization/miyang/waybill/model/WayBillProjectDelRequest.java rename to scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/waybill/model/WayBillProjectDelRequest.java index d2b542a..95fedc4 100644 --- a/scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/customization/miyang/waybill/model/WayBillProjectDelRequest.java +++ b/scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/waybill/model/WayBillProjectDelRequest.java @@ -1,4 +1,4 @@ -package com.czcb.scfs.api.service.v2.customization.miyang.waybill.model; +package com.czcb.scfs.api.service.v2.waybill.model; import com.czcb.scfs.api.core.ApiRequest; import com.czcb.scfs.api.core.agrs.TransType; diff --git a/scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/customization/miyang/waybill/model/WayBillProjectDelResponse.java b/scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/waybill/model/WayBillProjectDelResponse.java similarity index 92% rename from scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/customization/miyang/waybill/model/WayBillProjectDelResponse.java rename to scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/waybill/model/WayBillProjectDelResponse.java index 5ecf4e0..f952ba4 100644 --- a/scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/customization/miyang/waybill/model/WayBillProjectDelResponse.java +++ b/scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/waybill/model/WayBillProjectDelResponse.java @@ -1,4 +1,4 @@ -package com.czcb.scfs.api.service.v2.customization.miyang.waybill.model; +package com.czcb.scfs.api.service.v2.waybill.model; import com.czcb.scfs.api.core.ApiResponse; import com.google.gson.annotations.SerializedName; diff --git a/scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/customization/miyang/waybill/model/WayBillProjectQueryRequest.java b/scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/waybill/model/WayBillProjectQueryRequest.java similarity index 93% rename from scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/customization/miyang/waybill/model/WayBillProjectQueryRequest.java rename to scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/waybill/model/WayBillProjectQueryRequest.java index 724f4e9..6d1727b 100644 --- a/scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/customization/miyang/waybill/model/WayBillProjectQueryRequest.java +++ b/scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/waybill/model/WayBillProjectQueryRequest.java @@ -1,4 +1,4 @@ -package com.czcb.scfs.api.service.v2.customization.miyang.waybill.model; +package com.czcb.scfs.api.service.v2.waybill.model; import com.czcb.scfs.api.core.ApiRequest; import com.czcb.scfs.api.core.agrs.TransType; diff --git a/scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/customization/miyang/waybill/model/WayBillProjectQueryResponse.java b/scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/waybill/model/WayBillProjectQueryResponse.java similarity index 96% rename from scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/customization/miyang/waybill/model/WayBillProjectQueryResponse.java rename to scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/waybill/model/WayBillProjectQueryResponse.java index 6bc4b4c..11d5e6c 100644 --- a/scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/customization/miyang/waybill/model/WayBillProjectQueryResponse.java +++ b/scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/waybill/model/WayBillProjectQueryResponse.java @@ -1,4 +1,4 @@ -package com.czcb.scfs.api.service.v2.customization.miyang.waybill.model; +package com.czcb.scfs.api.service.v2.waybill.model; import com.czcb.scfs.api.core.ApiResponse; import com.google.gson.annotations.SerializedName; diff --git a/scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/customization/miyang/waybill/model/WayBillQueryRequest.java b/scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/waybill/model/WayBillQueryRequest.java similarity index 93% rename from scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/customization/miyang/waybill/model/WayBillQueryRequest.java rename to scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/waybill/model/WayBillQueryRequest.java index 19197cf..02e986f 100644 --- a/scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/customization/miyang/waybill/model/WayBillQueryRequest.java +++ b/scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/waybill/model/WayBillQueryRequest.java @@ -1,4 +1,4 @@ -package com.czcb.scfs.api.service.v2.customization.miyang.waybill.model; +package com.czcb.scfs.api.service.v2.waybill.model; import com.czcb.scfs.api.core.ApiRequest; import com.czcb.scfs.api.core.agrs.TransType; diff --git a/scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/customization/miyang/waybill/model/WayBillQueryResponse.java b/scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/waybill/model/WayBillQueryResponse.java similarity index 99% rename from scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/customization/miyang/waybill/model/WayBillQueryResponse.java rename to scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/waybill/model/WayBillQueryResponse.java index d71906e..6f3ce09 100644 --- a/scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/customization/miyang/waybill/model/WayBillQueryResponse.java +++ b/scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/waybill/model/WayBillQueryResponse.java @@ -1,4 +1,4 @@ -package com.czcb.scfs.api.service.v2.customization.miyang.waybill.model; +package com.czcb.scfs.api.service.v2.waybill.model; import com.czcb.scfs.api.core.ApiResponse; import com.google.gson.annotations.SerializedName; diff --git a/scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/waybill/model/WayBillRepayRequest.java b/scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/waybill/model/WayBillRepayRequest.java new file mode 100644 index 0000000..d4fbd91 --- /dev/null +++ b/scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/waybill/model/WayBillRepayRequest.java @@ -0,0 +1,90 @@ +package com.czcb.scfs.api.service.v2.waybill.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; + +/** + * 300513-贷款还款 + * + * @author H.T + * @since 2024-07-30 + */ +@Data +@Accessors(chain = true) +@TransType("300513") +public class WayBillRepayRequest implements ApiRequest { + /** + * 渠道编号 + */ + @SerializedName("channel_no") + private String channelNo; + + /** + * 应用编号 + */ + @SerializedName("app_no") + private String appNo; + + /** + * 流水号 + */ + @SerializedName("serial_no") + private String serialNo; + + /** + * 操作日期 yyyy-MM-dd + */ + @SerializedName("trans_date") + private String transDate; + + /** + * 操作时间 yyyy-MM-dd HH:mm:ss + */ + @SerializedName("trans_tradetime") + private String transTradeTime; + + /** + * 提前结费流水号 + */ + @SerializedName("auth_serial_no") + private String authSerialNo; + + /** + * 产品编号，贷款产品ID + */ + @SerializedName("product_id") + private String productId; + + /** + * 账号，申请人A1账户账号（车队长A1） + */ + @SerializedName("account_no") + private String accountNo; + + /** + * 户名，申请人A1账户户名（车队长A1） + */ + @SerializedName("account_name") + private String accountName; + + /** + * 收款账号(退款收款账户) + */ + @SerializedName("opp_account_no") + private String oppAccountNo; + + /** + * 收款户名(退款收款账户) + */ + @SerializedName("opp_account_name") + private String oppAccountName; + + /** + * 摘要 + */ + @SerializedName("remork") + private String remark; +} diff --git a/scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/waybill/model/WayBillRepayResponse.java b/scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/waybill/model/WayBillRepayResponse.java new file mode 100644 index 0000000..2673566 --- /dev/null +++ b/scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/waybill/model/WayBillRepayResponse.java @@ -0,0 +1,46 @@ +package com.czcb.scfs.api.service.v2.waybill.model; + +import com.czcb.scfs.api.core.ApiResponse; +import com.google.gson.annotations.SerializedName; +import lombok.Data; +import lombok.experimental.Accessors; + +/** + * 300513-贷款还款 + * + * @author H.T + * @since 2024-07-30 + */ +@Data +@Accessors(chain = true) +public class WayBillRepayResponse 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; +} \ No newline at end of file diff --git a/scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/customization/miyang/waybill/model/WayBillSettleRequest.java b/scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/waybill/model/WayBillSettleRequest.java similarity index 95% rename from scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/customization/miyang/waybill/model/WayBillSettleRequest.java rename to scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/waybill/model/WayBillSettleRequest.java index d0eec22..74c3478 100644 --- a/scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/customization/miyang/waybill/model/WayBillSettleRequest.java +++ b/scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/waybill/model/WayBillSettleRequest.java @@ -1,4 +1,4 @@ -package com.czcb.scfs.api.service.v2.customization.miyang.waybill.model; +package com.czcb.scfs.api.service.v2.waybill.model; import com.czcb.scfs.api.core.ApiRequest; import com.czcb.scfs.api.core.agrs.TransType; diff --git a/scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/customization/miyang/waybill/model/WayBillSettleResponse.java b/scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/waybill/model/WayBillSettleResponse.java similarity index 92% rename from scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/customization/miyang/waybill/model/WayBillSettleResponse.java rename to scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/waybill/model/WayBillSettleResponse.java index b705b8b..323073b 100644 --- a/scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/customization/miyang/waybill/model/WayBillSettleResponse.java +++ b/scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/waybill/model/WayBillSettleResponse.java @@ -1,4 +1,4 @@ -package com.czcb.scfs.api.service.v2.customization.miyang.waybill.model; +package com.czcb.scfs.api.service.v2.waybill.model; import com.czcb.scfs.api.core.ApiResponse; import com.google.gson.annotations.SerializedName; diff --git a/scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/customization/miyang/waybill/model/WaybillCancelRequest.java b/scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/waybill/model/WaybillCancelRequest.java similarity index 93% rename from scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/customization/miyang/waybill/model/WaybillCancelRequest.java rename to scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/waybill/model/WaybillCancelRequest.java index 3a719f3..ff9b1ac 100644 --- a/scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/customization/miyang/waybill/model/WaybillCancelRequest.java +++ b/scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/waybill/model/WaybillCancelRequest.java @@ -1,4 +1,4 @@ -package com.czcb.scfs.api.service.v2.customization.miyang.waybill.model; +package com.czcb.scfs.api.service.v2.waybill.model; import com.czcb.scfs.api.core.ApiRequest; import com.czcb.scfs.api.core.agrs.TransType; diff --git a/scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/customization/miyang/waybill/model/WaybillCancelResponse.java b/scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/waybill/model/WaybillCancelResponse.java similarity index 92% rename from scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/customization/miyang/waybill/model/WaybillCancelResponse.java rename to scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/waybill/model/WaybillCancelResponse.java index 9710a07..3bc5dc7 100644 --- a/scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/customization/miyang/waybill/model/WaybillCancelResponse.java +++ b/scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/waybill/model/WaybillCancelResponse.java @@ -1,4 +1,4 @@ -package com.czcb.scfs.api.service.v2.customization.miyang.waybill.model; +package com.czcb.scfs.api.service.v2.waybill.model; import com.czcb.scfs.api.core.ApiResponse; import com.google.gson.annotations.SerializedName; diff --git a/scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/customization/miyang/waybill/model/WaybillCreateRequest.java b/scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/waybill/model/WaybillCreateRequest.java similarity index 98% rename from scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/customization/miyang/waybill/model/WaybillCreateRequest.java rename to scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/waybill/model/WaybillCreateRequest.java index 3dd0c31..079c862 100644 --- a/scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/customization/miyang/waybill/model/WaybillCreateRequest.java +++ b/scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/waybill/model/WaybillCreateRequest.java @@ -1,4 +1,4 @@ -package com.czcb.scfs.api.service.v2.customization.miyang.waybill.model; +package com.czcb.scfs.api.service.v2.waybill.model; import com.czcb.scfs.api.core.ApiRequest; import com.czcb.scfs.api.core.agrs.TransType; diff --git a/scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/customization/miyang/waybill/model/WaybillCreateResponse.java b/scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/waybill/model/WaybillCreateResponse.java similarity index 92% rename from scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/customization/miyang/waybill/model/WaybillCreateResponse.java rename to scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/waybill/model/WaybillCreateResponse.java index faeafe0..662d32f 100644 --- a/scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/customization/miyang/waybill/model/WaybillCreateResponse.java +++ b/scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/waybill/model/WaybillCreateResponse.java @@ -1,4 +1,4 @@ -package com.czcb.scfs.api.service.v2.customization.miyang.waybill.model; +package com.czcb.scfs.api.service.v2.waybill.model; import com.czcb.scfs.api.core.ApiResponse; import com.google.gson.annotations.SerializedName; 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 d5535c9..4b3c7c4 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 @@ -10,8 +10,9 @@ import com.czcb.scfs.api.service.v2.bmd.BmdService; import com.czcb.scfs.api.service.v2.cat.order.OrderService; import com.czcb.scfs.api.service.v2.cat.project.ProjectService; import com.czcb.scfs.api.service.v2.communal.CommunalDataService; -import com.czcb.scfs.api.service.v2.customization.miyang.entpay.EntPayService; -import com.czcb.scfs.api.service.v2.customization.miyang.waybill.WayBillService; +import com.czcb.scfs.api.service.v2.entpay.EntPayService; +import com.czcb.scfs.api.service.v2.order.TradeOrdersSltService; +import com.czcb.scfs.api.service.v2.waybill.WayBillService; import com.czcb.scfs.api.service.v2.face.FaceService; import com.czcb.scfs.api.service.v2.file.FileService; import com.czcb.scfs.api.service.v2.invoice.InvoiceService; @@ -217,4 +218,13 @@ public class ScfsAutoConfiguration { return new WayBillService(apiClient); } + /** + * 米阳贸易订单功能 + */ + @Bean + @ConditionalOnMissingBean + public TradeOrdersSltService tradeOrdersSltService(ApiClient apiClient) { + return new TradeOrdersSltService(apiClient); + } + } diff --git a/scfs-api-test/src/test/java/com/czcb/scfs/api/test/service/EntPayServiceTest.java b/scfs-api-test/src/test/java/com/czcb/scfs/api/test/service/EntPayServiceTest.java index 4a86cf3..494c75d 100644 --- a/scfs-api-test/src/test/java/com/czcb/scfs/api/test/service/EntPayServiceTest.java +++ b/scfs-api-test/src/test/java/com/czcb/scfs/api/test/service/EntPayServiceTest.java @@ -1,8 +1,8 @@ package com.czcb.scfs.api.test.service; -import com.czcb.scfs.api.service.v2.customization.miyang.entpay.EntPayService; -import com.czcb.scfs.api.service.v2.customization.miyang.entpay.model.*; +import com.czcb.scfs.api.service.v2.entpay.EntPayService; +import com.czcb.scfs.api.service.v2.entpay.model.*; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; import org.slf4j.Logger;