From ba55c092e959b1b6e482b426d6e6261f1101f50f Mon Sep 17 00:00:00 2001 From: 13009 Date: Tue, 9 Apr 2024 19:03:57 +0800 Subject: [PATCH] =?UTF-8?q?ref:=20=E5=8F=97=E6=89=98=E6=94=AF=E4=BB=98?= =?UTF-8?q?=E4=BD=8D=E7=BD=AE=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/v1/account/AccountService.java | 39 ----------------- .../api/service/v1/bills/BillService.java | 14 +++++++ .../model/BalanceBillRequest.java | 2 +- .../model/BalanceBillResponse.java | 2 +- .../scfs/api/service/v1/file/FileService.java | 19 ++------- .../scfs/api/service/v1/pay/PayService.java | 42 +++++++++++++++++++ .../model/EntPayAgrtAddRequest.java} | 5 ++- .../model/EntPayAgrtAddResponse.java} | 4 +- .../model/EntPayAgrtDelRequest.java} | 4 +- .../model/EntPayAgrtDelResponse.java} | 4 +- .../model/EntPayAgrtQueryListRequest.java} | 4 +- .../model/EntPayAgrtQueryListResponse.java} | 5 ++- 12 files changed, 76 insertions(+), 68 deletions(-) rename scfs-api-service/src/main/java/com/czcb/scfs/api/service/v1/{file => bills}/model/BalanceBillRequest.java (95%) rename scfs-api-service/src/main/java/com/czcb/scfs/api/service/v1/{file => bills}/model/BalanceBillResponse.java (97%) rename scfs-api-service/src/main/java/com/czcb/scfs/api/service/v1/{account/model/EntpayagrtAddRequest.java => pay/model/EntPayAgrtAddRequest.java} (95%) rename scfs-api-service/src/main/java/com/czcb/scfs/api/service/v1/{account/model/EntpayagrtAddResponse.java => pay/model/EntPayAgrtAddResponse.java} (86%) rename scfs-api-service/src/main/java/com/czcb/scfs/api/service/v1/{account/model/EntpayagrtDelRequest.java => pay/model/EntPayAgrtDelRequest.java} (89%) rename scfs-api-service/src/main/java/com/czcb/scfs/api/service/v1/{account/model/EntpayagrtDelResponse.java => pay/model/EntPayAgrtDelResponse.java} (86%) rename scfs-api-service/src/main/java/com/czcb/scfs/api/service/v1/{account/model/EntpayagrtQueryListRequest.java => pay/model/EntPayAgrtQueryListRequest.java} (92%) rename scfs-api-service/src/main/java/com/czcb/scfs/api/service/v1/{account/model/EntpayagrtQueryListResponse.java => pay/model/EntPayAgrtQueryListResponse.java} (96%) diff --git a/scfs-api-service/src/main/java/com/czcb/scfs/api/service/v1/account/AccountService.java b/scfs-api-service/src/main/java/com/czcb/scfs/api/service/v1/account/AccountService.java index d9ba04d..414af2c 100644 --- a/scfs-api-service/src/main/java/com/czcb/scfs/api/service/v1/account/AccountService.java +++ b/scfs-api-service/src/main/java/com/czcb/scfs/api/service/v1/account/AccountService.java @@ -258,45 +258,6 @@ public class AccountService { return httpResponse.getServiceResponse(); } - /** - * 受托支付协议登记 - * - * @param entpayagrtAddRequest EntpayagrtAddRequest - * @return EntpayagrtAddResponse - */ - public EntpayagrtAddResponse entpayagrtAdd(EntpayagrtAddRequest entpayagrtAddRequest) { - String url = "/entpayagrt/add"; - HttpHeaders headers = new HttpHeaders(); - headers.addHeader(API_VERSION, V_1); - HttpResponse httpResponse = apiClient.post(url, headers, entpayagrtAddRequest.toJsonRequest(), EntpayagrtAddResponse.class); - return httpResponse.getServiceResponse(); - } - /** - * 受托支付协议删除 - * - * @param entpayagrtDelRequest EntpayagrtDelRequest - * @return EntpayagrtDelResponse - */ - public EntpayagrtDelResponse entpayagrtDel(EntpayagrtDelRequest entpayagrtDelRequest) { - String url = "/entpayagrt/del"; - HttpHeaders headers = new HttpHeaders(); - headers.addHeader(API_VERSION, V_1); - HttpResponse httpResponse = apiClient.post(url, headers, entpayagrtDelRequest.toJsonRequest(), EntpayagrtDelResponse.class); - return httpResponse.getServiceResponse(); - } - /** - * 受托支付协议列表 - * - * @param entpayagrtQueryListRequest EntpayagrtQueryListRequest - * @return EntpayagrtDelResponse - */ - public EntpayagrtQueryListResponse entpayagrtQueryList(EntpayagrtQueryListRequest entpayagrtQueryListRequest) { - String url = "/entpayagrt/queryList"; - HttpHeaders headers = new HttpHeaders(); - headers.addHeader(API_VERSION, V_1); - HttpResponse httpResponse = apiClient.post(url, headers, entpayagrtQueryListRequest.toJsonRequest(), EntpayagrtQueryListResponse.class); - return httpResponse.getServiceResponse(); - } /** * 开户（内部户） * diff --git a/scfs-api-service/src/main/java/com/czcb/scfs/api/service/v1/bills/BillService.java b/scfs-api-service/src/main/java/com/czcb/scfs/api/service/v1/bills/BillService.java index 6ad922c..f8aa4ab 100644 --- a/scfs-api-service/src/main/java/com/czcb/scfs/api/service/v1/bills/BillService.java +++ b/scfs-api-service/src/main/java/com/czcb/scfs/api/service/v1/bills/BillService.java @@ -56,4 +56,18 @@ public class BillService { HttpResponse httpResponse = apiClient.post(url, headers, checkBillRequest.toJsonRequest(), CheckBillResponse.class); return httpResponse.getServiceResponse(); } + + /** + * 余额回单下载 + * + * @param balanceBillRequest BalanceBillRequest + * @return BalanceBillResponse + */ + public BalanceBillResponse balanceBill(BalanceBillRequest balanceBillRequest) { + String url = "/download/balanceBill"; + HttpHeaders headers = new HttpHeaders(); + headers.addHeader(API_VERSION, V_1); + HttpResponse httpResponse = apiClient.post(url, headers, balanceBillRequest.toJsonRequest(), BalanceBillResponse.class); + return httpResponse.getServiceResponse(); + } } diff --git a/scfs-api-service/src/main/java/com/czcb/scfs/api/service/v1/file/model/BalanceBillRequest.java b/scfs-api-service/src/main/java/com/czcb/scfs/api/service/v1/bills/model/BalanceBillRequest.java similarity index 95% rename from scfs-api-service/src/main/java/com/czcb/scfs/api/service/v1/file/model/BalanceBillRequest.java rename to scfs-api-service/src/main/java/com/czcb/scfs/api/service/v1/bills/model/BalanceBillRequest.java index c7f6e88..58c382a 100644 --- a/scfs-api-service/src/main/java/com/czcb/scfs/api/service/v1/file/model/BalanceBillRequest.java +++ b/scfs-api-service/src/main/java/com/czcb/scfs/api/service/v1/bills/model/BalanceBillRequest.java @@ -1,4 +1,4 @@ -package com.czcb.scfs.api.service.v1.file.model; +package com.czcb.scfs.api.service.v1.bills.model; import com.czcb.scfs.api.core.ApiRequest; import com.czcb.scfs.api.service.TransType; diff --git a/scfs-api-service/src/main/java/com/czcb/scfs/api/service/v1/file/model/BalanceBillResponse.java b/scfs-api-service/src/main/java/com/czcb/scfs/api/service/v1/bills/model/BalanceBillResponse.java similarity index 97% rename from scfs-api-service/src/main/java/com/czcb/scfs/api/service/v1/file/model/BalanceBillResponse.java rename to scfs-api-service/src/main/java/com/czcb/scfs/api/service/v1/bills/model/BalanceBillResponse.java index 17b46ee..5cba1ea 100644 --- a/scfs-api-service/src/main/java/com/czcb/scfs/api/service/v1/file/model/BalanceBillResponse.java +++ b/scfs-api-service/src/main/java/com/czcb/scfs/api/service/v1/bills/model/BalanceBillResponse.java @@ -1,4 +1,4 @@ -package com.czcb.scfs.api.service.v1.file.model; +package com.czcb.scfs.api.service.v1.bills.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/v1/file/FileService.java b/scfs-api-service/src/main/java/com/czcb/scfs/api/service/v1/file/FileService.java index e815be3..419ecc2 100644 --- a/scfs-api-service/src/main/java/com/czcb/scfs/api/service/v1/file/FileService.java +++ b/scfs-api-service/src/main/java/com/czcb/scfs/api/service/v1/file/FileService.java @@ -3,7 +3,10 @@ package com.czcb.scfs.api.service.v1.file; 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.v1.file.model.*; +import com.czcb.scfs.api.service.v1.file.model.DownloadFileRequest; +import com.czcb.scfs.api.service.v1.file.model.DownloadFileResponse; +import com.czcb.scfs.api.service.v1.file.model.UploadFileRequest; +import com.czcb.scfs.api.service.v1.file.model.UploadFileResponse; import static com.czcb.scfs.api.core.Constants.API_VERSION; import static com.czcb.scfs.api.core.Constants.V_1; @@ -47,18 +50,4 @@ public class FileService { HttpResponse httpResponse = apiClient.post(url, headers, request.toJsonRequest(), DownloadFileResponse.class); return httpResponse.getServiceResponse(); } - - /** - * 余额回单下载 - * - * @param balanceBillRequest BalanceBillRequest - * @return BalanceBillResponse - */ - public BalanceBillResponse balanceBill(BalanceBillRequest balanceBillRequest) { - String url = "/download/balanceBill"; - HttpHeaders headers = new HttpHeaders(); - headers.addHeader(API_VERSION, V_1); - HttpResponse httpResponse = apiClient.post(url, headers, balanceBillRequest.toJsonRequest(), BalanceBillResponse.class); - return httpResponse.getServiceResponse(); - } } diff --git a/scfs-api-service/src/main/java/com/czcb/scfs/api/service/v1/pay/PayService.java b/scfs-api-service/src/main/java/com/czcb/scfs/api/service/v1/pay/PayService.java index 980d7e8..68d2666 100644 --- a/scfs-api-service/src/main/java/com/czcb/scfs/api/service/v1/pay/PayService.java +++ b/scfs-api-service/src/main/java/com/czcb/scfs/api/service/v1/pay/PayService.java @@ -131,4 +131,46 @@ public class PayService { HttpResponse httpResponse = apiClient.post(url, headers, earnestReleaseRequest.toJsonRequest(), EarnestReleaseResponse.class); return httpResponse.getServiceResponse(); } + + /** + * 受托支付协议登记 + * + * @param entPayAgrtAddRequest EntPayAgrtAddRequest + * @return EntPayAgrtAddResponse + */ + public EntPayAgrtAddResponse entPayAgrtAdd(EntPayAgrtAddRequest entPayAgrtAddRequest) { + String url = "/entpayagrt/add"; + HttpHeaders headers = new HttpHeaders(); + headers.addHeader(API_VERSION, V_1); + HttpResponse httpResponse = apiClient.post(url, headers, entPayAgrtAddRequest.toJsonRequest(), EntPayAgrtAddResponse.class); + return httpResponse.getServiceResponse(); + } + + /** + * 受托支付协议删除 + * + * @param entPayAgrtDelRequest EntPayAgrtDelRequest + * @return EntPayAgrtDelResponse + */ + public EntPayAgrtDelResponse entPayAgrtDel(EntPayAgrtDelRequest entPayAgrtDelRequest) { + String url = "/entpayagrt/del"; + HttpHeaders headers = new HttpHeaders(); + headers.addHeader(API_VERSION, V_1); + HttpResponse httpResponse = apiClient.post(url, headers, entPayAgrtDelRequest.toJsonRequest(), EntPayAgrtDelResponse.class); + return httpResponse.getServiceResponse(); + } + + /** + * 受托支付协议列表 + * + * @param entPayAgrtQueryListRequest EntPayAgrtQueryListRequest + * @return EntPayAgrtQueryListResponse + */ + public EntPayAgrtQueryListResponse entPayAgrtQueryList(EntPayAgrtQueryListRequest entPayAgrtQueryListRequest) { + String url = "/entpayagrt/queryList"; + HttpHeaders headers = new HttpHeaders(); + headers.addHeader(API_VERSION, V_1); + HttpResponse httpResponse = apiClient.post(url, headers, entPayAgrtQueryListRequest.toJsonRequest(), EntPayAgrtQueryListResponse.class); + return httpResponse.getServiceResponse(); + } } diff --git a/scfs-api-service/src/main/java/com/czcb/scfs/api/service/v1/account/model/EntpayagrtAddRequest.java b/scfs-api-service/src/main/java/com/czcb/scfs/api/service/v1/pay/model/EntPayAgrtAddRequest.java similarity index 95% rename from scfs-api-service/src/main/java/com/czcb/scfs/api/service/v1/account/model/EntpayagrtAddRequest.java rename to scfs-api-service/src/main/java/com/czcb/scfs/api/service/v1/pay/model/EntPayAgrtAddRequest.java index ed84361..a68acba 100644 --- a/scfs-api-service/src/main/java/com/czcb/scfs/api/service/v1/account/model/EntpayagrtAddRequest.java +++ b/scfs-api-service/src/main/java/com/czcb/scfs/api/service/v1/pay/model/EntPayAgrtAddRequest.java @@ -1,10 +1,11 @@ -package com.czcb.scfs.api.service.v1.account.model; +package com.czcb.scfs.api.service.v1.pay.model; import com.czcb.scfs.api.core.ApiRequest; import com.czcb.scfs.api.service.TransType; import com.google.gson.annotations.SerializedName; import lombok.Data; import lombok.experimental.Accessors; + /** * 受托支付协议登记 * @@ -14,7 +15,7 @@ import lombok.experimental.Accessors; @Data @Accessors(chain = true) @TransType("102211") -public class EntpayagrtAddRequest implements ApiRequest { +public class EntPayAgrtAddRequest implements ApiRequest { /** * 渠道编号 */ diff --git a/scfs-api-service/src/main/java/com/czcb/scfs/api/service/v1/account/model/EntpayagrtAddResponse.java b/scfs-api-service/src/main/java/com/czcb/scfs/api/service/v1/pay/model/EntPayAgrtAddResponse.java similarity index 86% rename from scfs-api-service/src/main/java/com/czcb/scfs/api/service/v1/account/model/EntpayagrtAddResponse.java rename to scfs-api-service/src/main/java/com/czcb/scfs/api/service/v1/pay/model/EntPayAgrtAddResponse.java index 961b04f..9b13a9f 100644 --- a/scfs-api-service/src/main/java/com/czcb/scfs/api/service/v1/account/model/EntpayagrtAddResponse.java +++ b/scfs-api-service/src/main/java/com/czcb/scfs/api/service/v1/pay/model/EntPayAgrtAddResponse.java @@ -1,4 +1,4 @@ -package com.czcb.scfs.api.service.v1.account.model; +package com.czcb.scfs.api.service.v1.pay.model; import com.czcb.scfs.api.core.ApiResponse; import com.google.gson.annotations.SerializedName; @@ -13,7 +13,7 @@ import lombok.experimental.Accessors; */ @Data @Accessors(chain = true) -public class EntpayagrtAddResponse implements ApiResponse { +public class EntPayAgrtAddResponse implements ApiResponse { /** * 返回码 000000：表示成功，才有基础要素输出 */ diff --git a/scfs-api-service/src/main/java/com/czcb/scfs/api/service/v1/account/model/EntpayagrtDelRequest.java b/scfs-api-service/src/main/java/com/czcb/scfs/api/service/v1/pay/model/EntPayAgrtDelRequest.java similarity index 89% rename from scfs-api-service/src/main/java/com/czcb/scfs/api/service/v1/account/model/EntpayagrtDelRequest.java rename to scfs-api-service/src/main/java/com/czcb/scfs/api/service/v1/pay/model/EntPayAgrtDelRequest.java index 39a5354..da80391 100644 --- a/scfs-api-service/src/main/java/com/czcb/scfs/api/service/v1/account/model/EntpayagrtDelRequest.java +++ b/scfs-api-service/src/main/java/com/czcb/scfs/api/service/v1/pay/model/EntPayAgrtDelRequest.java @@ -1,4 +1,4 @@ -package com.czcb.scfs.api.service.v1.account.model; +package com.czcb.scfs.api.service.v1.pay.model; import com.czcb.scfs.api.core.ApiRequest; import com.czcb.scfs.api.service.TransType; @@ -15,7 +15,7 @@ import lombok.experimental.Accessors; @Data @Accessors(chain = true) @TransType("102212") -public class EntpayagrtDelRequest implements ApiRequest { +public class EntPayAgrtDelRequest implements ApiRequest { /** * 渠道编号 */ diff --git a/scfs-api-service/src/main/java/com/czcb/scfs/api/service/v1/account/model/EntpayagrtDelResponse.java b/scfs-api-service/src/main/java/com/czcb/scfs/api/service/v1/pay/model/EntPayAgrtDelResponse.java similarity index 86% rename from scfs-api-service/src/main/java/com/czcb/scfs/api/service/v1/account/model/EntpayagrtDelResponse.java rename to scfs-api-service/src/main/java/com/czcb/scfs/api/service/v1/pay/model/EntPayAgrtDelResponse.java index 2b5e892..919d644 100644 --- a/scfs-api-service/src/main/java/com/czcb/scfs/api/service/v1/account/model/EntpayagrtDelResponse.java +++ b/scfs-api-service/src/main/java/com/czcb/scfs/api/service/v1/pay/model/EntPayAgrtDelResponse.java @@ -1,4 +1,4 @@ -package com.czcb.scfs.api.service.v1.account.model; +package com.czcb.scfs.api.service.v1.pay.model; import com.czcb.scfs.api.core.ApiResponse; import com.google.gson.annotations.SerializedName; @@ -13,7 +13,7 @@ import lombok.experimental.Accessors; */ @Data @Accessors(chain = true) -public class EntpayagrtDelResponse implements ApiResponse { +public class EntPayAgrtDelResponse implements ApiResponse { /** * 返回码 000000：表示成功，才有基础要素输出 */ diff --git a/scfs-api-service/src/main/java/com/czcb/scfs/api/service/v1/account/model/EntpayagrtQueryListRequest.java b/scfs-api-service/src/main/java/com/czcb/scfs/api/service/v1/pay/model/EntPayAgrtQueryListRequest.java similarity index 92% rename from scfs-api-service/src/main/java/com/czcb/scfs/api/service/v1/account/model/EntpayagrtQueryListRequest.java rename to scfs-api-service/src/main/java/com/czcb/scfs/api/service/v1/pay/model/EntPayAgrtQueryListRequest.java index 7c28322..1af9300 100644 --- a/scfs-api-service/src/main/java/com/czcb/scfs/api/service/v1/account/model/EntpayagrtQueryListRequest.java +++ b/scfs-api-service/src/main/java/com/czcb/scfs/api/service/v1/pay/model/EntPayAgrtQueryListRequest.java @@ -1,4 +1,4 @@ -package com.czcb.scfs.api.service.v1.account.model; +package com.czcb.scfs.api.service.v1.pay.model; import com.czcb.scfs.api.core.ApiRequest; import com.czcb.scfs.api.service.TransType; @@ -15,7 +15,7 @@ import lombok.experimental.Accessors; @Data @Accessors(chain = true) @TransType("102213") -public class EntpayagrtQueryListRequest implements ApiRequest { +public class EntPayAgrtQueryListRequest implements ApiRequest { /** * 渠道编号 */ diff --git a/scfs-api-service/src/main/java/com/czcb/scfs/api/service/v1/account/model/EntpayagrtQueryListResponse.java b/scfs-api-service/src/main/java/com/czcb/scfs/api/service/v1/pay/model/EntPayAgrtQueryListResponse.java similarity index 96% rename from scfs-api-service/src/main/java/com/czcb/scfs/api/service/v1/account/model/EntpayagrtQueryListResponse.java rename to scfs-api-service/src/main/java/com/czcb/scfs/api/service/v1/pay/model/EntPayAgrtQueryListResponse.java index a6646f4..a67ee60 100644 --- a/scfs-api-service/src/main/java/com/czcb/scfs/api/service/v1/account/model/EntpayagrtQueryListResponse.java +++ b/scfs-api-service/src/main/java/com/czcb/scfs/api/service/v1/pay/model/EntPayAgrtQueryListResponse.java @@ -1,4 +1,4 @@ -package com.czcb.scfs.api.service.v1.account.model; +package com.czcb.scfs.api.service.v1.pay.model; import com.czcb.scfs.api.core.ApiResponse; import com.google.gson.annotations.SerializedName; @@ -16,7 +16,7 @@ import java.util.List; */ @Data @Accessors(chain = true) -public class EntpayagrtQueryListResponse implements ApiResponse { +public class EntPayAgrtQueryListResponse implements ApiResponse { /** * 返回码 000000：表示成功，才有基础要素输出 */ @@ -42,6 +42,7 @@ public class EntpayagrtQueryListResponse implements ApiResponse { */ @SerializedName("sys_time") private String sysTime; + @Data @Accessors(chain = true) public static class RecodeList implements Serializable {