diff --git a/scfs-api-core/src/main/java/com/czcb/scfs/api/core/Constants.java b/scfs-api-core/src/main/java/com/czcb/scfs/api/core/Constants.java index b7831f0..c1a8dc0 100644 --- a/scfs-api-core/src/main/java/com/czcb/scfs/api/core/Constants.java +++ b/scfs-api-core/src/main/java/com/czcb/scfs/api/core/Constants.java @@ -5,7 +5,7 @@ package com.czcb.scfs.api.core; * * @since 2.0.0 */ -public class Constants { +public final class Constants { private Constants() { } @@ -30,7 +30,6 @@ public class Constants { public static final String CONTENT_ENCODING = "Content-Encoding"; public static final String GZIP_ENCODING = "gzip"; public static final int HEX = 16; - public static final String BASE_CHAR = "0123456789abcdefghijklmnopqrstuvwxyz"; // version public static final String V_1 = "1.0.0"; diff --git a/scfs-api-core/src/main/java/com/czcb/scfs/api/core/util/Strings.java b/scfs-api-core/src/main/java/com/czcb/scfs/api/core/util/Strings.java index cdfec22..f470d12 100644 --- a/scfs-api-core/src/main/java/com/czcb/scfs/api/core/util/Strings.java +++ b/scfs-api-core/src/main/java/com/czcb/scfs/api/core/util/Strings.java @@ -1,6 +1,5 @@ package com.czcb.scfs.api.core.util; -import com.czcb.scfs.api.core.Constants; import com.czcb.scfs.api.core.exception.EncodingException; import java.net.URLEncoder; @@ -14,7 +13,7 @@ import java.util.Random; * @since 2.0.0 */ public class Strings { - + private static final String BASE_CHAR = "0123456789abcdefghijklmnopqrstuvwxyz"; private static final SecureRandom random = new SecureRandom(); private Strings() { @@ -55,7 +54,7 @@ public class Strings { } public static String randomString(int length) { - return randomString(Constants.BASE_CHAR, length); + return randomString(BASE_CHAR, length); } public static int randomInt(int limit) { 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 2f4dd21..75e15f3 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 @@ -22,140 +22,140 @@ public class AccountService { /** * 电子登记簿账户修改-个人 * - * @param request ModAccRequest + * @param modAccPersonRequest ModAccRequest * @return ModAccResponse */ - public ModAccPersonResponse modAccPerson(ModAccPersonRequest request) { + public ModAccPersonResponse modAccPerson(ModAccPersonRequest modAccPersonRequest) { String url = "/accInfo/modAcc"; HttpHeaders headers = new HttpHeaders(); headers.addHeader(API_VERSION, V_1); - HttpResponse httpResponse = apiClient.post(url, headers, request.toJsonRequest(), ModAccPersonResponse.class); + HttpResponse httpResponse = apiClient.post(url, headers, modAccPersonRequest.toJsonRequest(), ModAccPersonResponse.class); return httpResponse.getServiceResponse(); } /** * 电子登记簿账户修改-企业 * - * @param request ModAccCompanyRequest + * @param modAccCompanyRequest ModAccCompanyRequest * @return ModAccCompanyResponse */ - public ModAccCompanyResponse modAccCompany(ModAccCompanyRequest request) { + public ModAccCompanyResponse modAccCompany(ModAccCompanyRequest modAccCompanyRequest) { String url = "/accInfo/modAcc"; HttpHeaders headers = new HttpHeaders(); headers.addHeader(API_VERSION, V_1); - HttpResponse httpResponse = apiClient.post(url, headers, request.toJsonRequest(), ModAccCompanyResponse.class); + HttpResponse httpResponse = apiClient.post(url, headers, modAccCompanyRequest.toJsonRequest(), ModAccCompanyResponse.class); return httpResponse.getServiceResponse(); } /** * 电查询余额 * - * @param request QueryBalanceRequest + * @param queryBalanceRequest QueryBalanceRequest * @return QueryBalanceResponse */ - public QueryBalanceResponse queryBalance(QueryBalanceRequest request) { + public QueryBalanceResponse queryBalance(QueryBalanceRequest queryBalanceRequest) { String url = "/accInfo/queryBalance"; HttpHeaders headers = new HttpHeaders(); headers.addHeader(API_VERSION, V_1); - HttpResponse httpResponse = apiClient.post(url, headers, request.toJsonRequest(), QueryBalanceResponse.class); + HttpResponse httpResponse = apiClient.post(url, headers, queryBalanceRequest.toJsonRequest(), QueryBalanceResponse.class); return httpResponse.getServiceResponse(); } /** * 卡信息查询 * - * @param request QueryCardInfoRequest + * @param queryCardInfoRequest QueryCardInfoRequest * @return QueryCardInfoResponse */ - public QueryCardInfoResponse queryCardInfo(QueryCardInfoRequest request) { + public QueryCardInfoResponse queryCardInfo(QueryCardInfoRequest queryCardInfoRequest) { String url = "/accInfo/queryCardInfo"; HttpHeaders headers = new HttpHeaders(); headers.addHeader(API_VERSION, V_1); - HttpResponse httpResponse = apiClient.post(url, headers, request.toJsonRequest(), QueryCardInfoResponse.class); + HttpResponse httpResponse = apiClient.post(url, headers, queryCardInfoRequest.toJsonRequest(), QueryCardInfoResponse.class); return httpResponse.getServiceResponse(); } /** * 绑定账号新增-个人 * - * @param request AddPrimAccRequest + * @param addPrimAccPersonRequest AddPrimAccRequest * @return AddPrimAccResponse */ - public AddPrimAccPersonResponse addPrimAccPerson(AddPrimAccPersonRequest request) { + public AddPrimAccPersonResponse addPrimAccPerson(AddPrimAccPersonRequest addPrimAccPersonRequest) { String url = "/accInfo/addPrimAcc"; HttpHeaders headers = new HttpHeaders(); headers.addHeader(API_VERSION, V_1); - HttpResponse httpResponse = apiClient.post(url, headers, request.toJsonRequest(), AddPrimAccPersonResponse.class); + HttpResponse httpResponse = apiClient.post(url, headers, addPrimAccPersonRequest.toJsonRequest(), AddPrimAccPersonResponse.class); return httpResponse.getServiceResponse(); } /** * 绑定账号新增-企业 * - * @param request AddPrimAccPersonRequest + * @param addPrimAccCompanyRequest AddPrimAccPersonRequest * @return AddPrimAccPersonResponse */ - public AddPrimAccCompanyResponse addPrimAccCompany(AddPrimAccCompanyRequest request) { + public AddPrimAccCompanyResponse addPrimAccCompany(AddPrimAccCompanyRequest addPrimAccCompanyRequest) { String url = "/accInfo/addPrimAcc"; HttpHeaders headers = new HttpHeaders(); headers.addHeader(API_VERSION, V_1); - HttpResponse httpResponse = apiClient.post(url, headers, request.toJsonRequest(), AddPrimAccCompanyResponse.class); + HttpResponse httpResponse = apiClient.post(url, headers, addPrimAccCompanyRequest.toJsonRequest(), AddPrimAccCompanyResponse.class); return httpResponse.getServiceResponse(); } /** * 绑定账号查询 * - * @param request InqPrimAccRequest + * @param inqPrimAccRequest InqPrimAccRequest * @return InqPrimAccResponse */ - public InqPrimAccResponse inqPrimAcc(InqPrimAccRequest request) { + public InqPrimAccResponse inqPrimAcc(InqPrimAccRequest inqPrimAccRequest) { String url = "/accInfo/inqPrimAcc"; HttpHeaders headers = new HttpHeaders(); headers.addHeader(API_VERSION, V_1); - HttpResponse httpResponse = apiClient.post(url, headers, request.toJsonRequest(), InqPrimAccResponse.class); + HttpResponse httpResponse = apiClient.post(url, headers, inqPrimAccRequest.toJsonRequest(), InqPrimAccResponse.class); return httpResponse.getServiceResponse(); } /** * 绑定账号设定 * - * @param request SetPrimAccRequest + * @param setPrimAccRequest SetPrimAccRequest * @return SetPrimAccResponse */ - public SetPrimAccResponse setPrimAcc(SetPrimAccRequest request) { + public SetPrimAccResponse setPrimAcc(SetPrimAccRequest setPrimAccRequest) { String url = "/accInfo/setPrimAcc"; HttpHeaders headers = new HttpHeaders(); headers.addHeader(API_VERSION, V_1); - HttpResponse httpResponse = apiClient.post(url, headers, request.toJsonRequest(), SetPrimAccResponse.class); + HttpResponse httpResponse = apiClient.post(url, headers, setPrimAccRequest.toJsonRequest(), SetPrimAccResponse.class); return httpResponse.getServiceResponse(); } /** * 绑定账号删除 * - * @param request DelPrimAccRequest + * @param delPrimAccRequest DelPrimAccRequest * @return DelPrimAccResponse */ - public DelPrimAccResponse delPrimAcc(DelPrimAccRequest request) { + public DelPrimAccResponse delPrimAcc(DelPrimAccRequest delPrimAccRequest) { String url = "/accInfo/delPrimAcc"; HttpHeaders headers = new HttpHeaders(); headers.addHeader(API_VERSION, V_1); - HttpResponse httpResponse = apiClient.post(url, headers, request.toJsonRequest(), DelPrimAccResponse.class); + HttpResponse httpResponse = apiClient.post(url, headers, delPrimAccRequest.toJsonRequest(), DelPrimAccResponse.class); return httpResponse.getServiceResponse(); } /** * 账户销户 * - * @param request ClosedAccRequest + * @param closedAccRequest ClosedAccRequest * @return ClosedAccResponse */ - public ClosedAccResponse closedAcc(ClosedAccRequest request) { + public ClosedAccResponse closedAcc(ClosedAccRequest closedAccRequest) { String url = "/accInfo/closedAcc"; HttpHeaders headers = new HttpHeaders(); headers.addHeader(API_VERSION, V_1); - HttpResponse httpResponse = apiClient.post(url, headers, request.toJsonRequest(), ClosedAccResponse.class); + HttpResponse httpResponse = apiClient.post(url, headers, closedAccRequest.toJsonRequest(), ClosedAccResponse.class); return httpResponse.getServiceResponse(); } } diff --git a/scfs-api-service/src/main/java/com/czcb/scfs/api/service/v1/bmd/BmdService.java b/scfs-api-service/src/main/java/com/czcb/scfs/api/service/v1/bmd/BmdService.java index 9aba9b3..60b140a 100644 --- a/scfs-api-service/src/main/java/com/czcb/scfs/api/service/v1/bmd/BmdService.java +++ b/scfs-api-service/src/main/java/com/czcb/scfs/api/service/v1/bmd/BmdService.java @@ -22,42 +22,42 @@ public class BmdService { /** * 白名单新增 * - * @param request BmdAddRequest + * @param bmdAddRequest BmdAddRequest * @return BmdAddResponse */ - public BmdAddResponse bmdAdd(BmdAddRequest request) { + public BmdAddResponse bmdAdd(BmdAddRequest bmdAddRequest) { String url = "/bmdManager/bmdAdd"; HttpHeaders headers = new HttpHeaders(); headers.addHeader(API_VERSION, V_1); - HttpResponse httpResponse = apiClient.post(url, headers, request.toJsonRequest(), BmdAddResponse.class); + HttpResponse httpResponse = apiClient.post(url, headers, bmdAddRequest.toJsonRequest(), BmdAddResponse.class); return httpResponse.getServiceResponse(); } /** * 白名单删除 * - * @param request BmdDelRequest + * @param bmdDelRequest BmdDelRequest * @return BmdDelResponse */ - public BmdDelResponse bmdDel(BmdDelRequest request) { + public BmdDelResponse bmdDel(BmdDelRequest bmdDelRequest) { String url = "/bmdManager/bmdDel"; HttpHeaders headers = new HttpHeaders(); headers.addHeader(API_VERSION, V_1); - HttpResponse httpResponse = apiClient.post(url, headers, request.toJsonRequest(), BmdDelResponse.class); + HttpResponse httpResponse = apiClient.post(url, headers, bmdDelRequest.toJsonRequest(), BmdDelResponse.class); return httpResponse.getServiceResponse(); } /** * 白名单列表查询 * - * @param request BmdListRequest + * @param bmdListRequest BmdListRequest * @return BmdListResponse */ - public BmdListResponse bmdList(BmdListRequest request) { + public BmdListResponse bmdList(BmdListRequest bmdListRequest) { String url = "/bmdManager/bmdList"; HttpHeaders headers = new HttpHeaders(); headers.addHeader(API_VERSION, V_1); - HttpResponse httpResponse = apiClient.post(url, headers, request.toJsonRequest(), BmdListResponse.class); + HttpResponse httpResponse = apiClient.post(url, headers, bmdListRequest.toJsonRequest(), BmdListResponse.class); return httpResponse.getServiceResponse(); } } diff --git a/scfs-api-service/src/main/java/com/czcb/scfs/api/service/v1/face/FaceService.java b/scfs-api-service/src/main/java/com/czcb/scfs/api/service/v1/face/FaceService.java index b0c90bb..d068146 100644 --- a/scfs-api-service/src/main/java/com/czcb/scfs/api/service/v1/face/FaceService.java +++ b/scfs-api-service/src/main/java/com/czcb/scfs/api/service/v1/face/FaceService.java @@ -24,14 +24,14 @@ public class FaceService { /** * 人脸识别 * - * @param request FaceFileRequest + * @param faceFileRequest FaceFileRequest * @return FaceFileResponse */ - public FaceFileResponse face(FaceFileRequest request) { + public FaceFileResponse face(FaceFileRequest faceFileRequest) { String url = "/face/imageRecognize"; HttpHeaders headers = new HttpHeaders(); headers.addHeader(API_VERSION, V_1); - HttpResponse httpResponse = apiClient.post(url, headers, request.toJsonRequest(), FaceFileResponse.class); + HttpResponse httpResponse = apiClient.post(url, headers, faceFileRequest.toJsonRequest(), FaceFileResponse.class); return httpResponse.getServiceResponse(); } } 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 67ef788..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 @@ -26,14 +26,14 @@ public class FileService { /** * 上传文件 * - * @param request UploadFileRequest + * @param uploadFileRequest UploadFileRequest * @return UploadFileResponse */ - public UploadFileResponse uploadFile(UploadFileRequest request) { + public UploadFileResponse uploadFile(UploadFileRequest uploadFileRequest) { String url = "/upload/uploadFile"; HttpHeaders headers = new HttpHeaders(); headers.addHeader(API_VERSION, V_1); - HttpResponse httpResponse = apiClient.post(url, headers, request.toJsonRequest(), UploadFileResponse.class); + HttpResponse httpResponse = apiClient.post(url, headers, uploadFileRequest.toJsonRequest(), UploadFileResponse.class); return httpResponse.getServiceResponse(); } diff --git a/scfs-api-service/src/main/java/com/czcb/scfs/api/service/v1/ocr/OcrService.java b/scfs-api-service/src/main/java/com/czcb/scfs/api/service/v1/ocr/OcrService.java index b93a90b..ef3b9f8 100644 --- a/scfs-api-service/src/main/java/com/czcb/scfs/api/service/v1/ocr/OcrService.java +++ b/scfs-api-service/src/main/java/com/czcb/scfs/api/service/v1/ocr/OcrService.java @@ -23,14 +23,14 @@ public class OcrService { /** * ORC识别 * - * @param request OcrFileRequest + * @param ocrFileRequest OcrFileRequest * @return OcrFileResponse */ - public OcrFileResponse downloadFile(OcrFileRequest request) { + public OcrFileResponse downloadFile(OcrFileRequest ocrFileRequest) { String url = "/ocr/imageRecognize"; HttpHeaders headers = new HttpHeaders(); headers.addHeader(API_VERSION, V_1); - HttpResponse httpResponse = apiClient.post(url, headers, request.toJsonRequest(), OcrFileResponse.class); + HttpResponse httpResponse = apiClient.post(url, headers, ocrFileRequest.toJsonRequest(), OcrFileResponse.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 61e7851..d650ad0 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 @@ -22,42 +22,56 @@ public class PayService { /** * 提现 * - * @param request MerWithdrawRequest + * @param merWithdrawRequest MerWithdrawRequest * @return MerWithdrawResponse */ - public MerWithdrawResponse withdraw(MerWithdrawRequest request) { + public MerWithdrawResponse withdraw(MerWithdrawRequest merWithdrawRequest) { String url = "/merTrade/mer_withdraw"; HttpHeaders headers = new HttpHeaders(); headers.addHeader(API_VERSION, V_1); - HttpResponse httpResponse = apiClient.post(url, headers, request.toJsonRequest(), MerWithdrawResponse.class); + HttpResponse httpResponse = apiClient.post(url, headers, merWithdrawRequest.toJsonRequest(), MerWithdrawResponse.class); return httpResponse.getServiceResponse(); } /** * 提现查证 * - * @param request MerWithdrawCheckRequest + * @param merWithdrawCheckRequest MerWithdrawCheckRequest * @return MerWithdrawCheckResponse */ - public MerWithdrawCheckResponse withdrawCheck(MerWithdrawCheckRequest request) { + public MerWithdrawCheckResponse withdrawCheck(MerWithdrawCheckRequest merWithdrawCheckRequest) { String url = "/merTrade/mer_withdraw_check"; HttpHeaders headers = new HttpHeaders(); headers.addHeader(API_VERSION, V_1); - HttpResponse httpResponse = apiClient.post(url, headers, request.toJsonRequest(), MerWithdrawCheckResponse.class); + HttpResponse httpResponse = apiClient.post(url, headers, merWithdrawCheckRequest.toJsonRequest(), MerWithdrawCheckResponse.class); return httpResponse.getServiceResponse(); } /** * 快捷充值 * - * @param request MerDepositRequest + * @param merDepositRequest MerDepositRequest * @return MerDepositResponse */ - public MerDepositResponse withdrawCheck(MerDepositRequest request) { + public MerDepositResponse deposit(MerDepositRequest merDepositRequest) { String url = "/merTrade/mer_deposit"; HttpHeaders headers = new HttpHeaders(); headers.addHeader(API_VERSION, V_1); - HttpResponse httpResponse = apiClient.post(url, headers, request.toJsonRequest(), MerDepositResponse.class); + HttpResponse httpResponse = apiClient.post(url, headers, merDepositRequest.toJsonRequest(), MerDepositResponse.class); + return httpResponse.getServiceResponse(); + } + + /** + * 快捷充值查证 + * + * @param merDepositCheckRequest MerDepositCheckRequest + * @return MerDepositCheckResponse + */ + public MerDepositCheckResponse depositCheck(MerDepositCheckRequest merDepositCheckRequest) { + String url = "/merTrade/mer_deposit_check"; + HttpHeaders headers = new HttpHeaders(); + headers.addHeader(API_VERSION, V_1); + HttpResponse httpResponse = apiClient.post(url, headers, merDepositCheckRequest.toJsonRequest(), MerDepositCheckResponse.class); return httpResponse.getServiceResponse(); } } diff --git a/scfs-api-service/src/main/java/com/czcb/scfs/api/service/v1/pay/model/MerDepositCheckRequest.java b/scfs-api-service/src/main/java/com/czcb/scfs/api/service/v1/pay/model/MerDepositCheckRequest.java new file mode 100644 index 0000000..c061372 --- /dev/null +++ b/scfs-api-service/src/main/java/com/czcb/scfs/api/service/v1/pay/model/MerDepositCheckRequest.java @@ -0,0 +1,60 @@ +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; + +/** + * 快捷充值查证 + * + * @author wangwei + * @since 2.0.0 + */ +@Data +@Accessors(chain = true) +@TransType("100021") +public class MerDepositCheckRequest implements ApiRequest { + /** + * 渠道编号 + */ + @SerializedName("channel_no") + private String channelNo; + + /** + * 应用编号 + */ + @SerializedName("app_no") + private String appNo; + + /** + * 流水号 + */ + @SerializedName("serial_no") + private String serialNo; + + /** + * 原交易流水号 + */ + @SerializedName("original_serialno") + private String originalSerialNo; + + /** + * 操作日期 + */ + @SerializedName("trans_date") + private String transDate; + + /** + * 操作时间 + */ + @SerializedName("trans_tradetime") + private String transTradeTime; + + /** + * 操作柜员 + */ + @SerializedName("trans_teller") + private String transTeller; +} diff --git a/scfs-api-service/src/main/java/com/czcb/scfs/api/service/v1/pay/model/MerDepositCheckResponse.java b/scfs-api-service/src/main/java/com/czcb/scfs/api/service/v1/pay/model/MerDepositCheckResponse.java new file mode 100644 index 0000000..b57ef24 --- /dev/null +++ b/scfs-api-service/src/main/java/com/czcb/scfs/api/service/v1/pay/model/MerDepositCheckResponse.java @@ -0,0 +1,85 @@ +package com.czcb.scfs.api.service.v1.pay.model; + +import com.czcb.scfs.api.core.ApiResponse; +import com.google.gson.annotations.SerializedName; +import lombok.Data; + +/** + * 快捷充值查证 + * + * @author wangwei + * @since 2.0.0 + */ +@Data +public class MerDepositCheckResponse implements ApiResponse { + /** + * 000000：表示成功 + */ + @SerializedName("recode") + private String recode; + + /** + * 结果信息 + */ + @SerializedName("recode_Info") + private String recodeInfo; + + /** + * 流水号 + */ + @SerializedName("serial_no") + private String serialNo; + + /** + * 取现状态，0：未知 1：成功 2：失败 + */ + @SerializedName("status") + private String status; + + /** + * 失败原因 + */ + @SerializedName("info") + private String info; + + /** + * 账号 + */ + @SerializedName("account_no") + private String accountNo; + + /** + * 户名 + */ + @SerializedName("account_name") + private String accountName; + + /** + * 原交易流水号 + */ + @SerializedName("original_serialno") + private String originalSerialNo; + /** + * 主账号 + */ + @SerializedName("primary_account") + private String primaryAccount; + + /** + * 交易金额 + */ + @SerializedName("trans_amount") + private String transAmount; + + /** + * 系统日期（YYYY-MM-DD） + */ + @SerializedName("sys_date") + private String sysDate; + + /** + * 系统时间（YYYY-MM-DD hh:mm:ss） + */ + @SerializedName("recode_Info") + private String sysTime; +} diff --git a/scfs-api-service/src/main/java/com/czcb/scfs/api/service/v1/sms/SmsService.java b/scfs-api-service/src/main/java/com/czcb/scfs/api/service/v1/sms/SmsService.java index cb75d70..54c2e77 100644 --- a/scfs-api-service/src/main/java/com/czcb/scfs/api/service/v1/sms/SmsService.java +++ b/scfs-api-service/src/main/java/com/czcb/scfs/api/service/v1/sms/SmsService.java @@ -21,11 +21,11 @@ public class SmsService { this.apiClient = apiClient; } - public SendVerifySignResponse send(SendVerifySignRequest request) { + public SendVerifySignResponse send(SendVerifySignRequest sendVerifySignRequest) { String url = "/sms/sendVerifySign"; HttpHeaders headers = new HttpHeaders(); headers.addHeader(API_VERSION, V_1); - HttpResponse httpResponse = apiClient.post(url, headers, request.toJsonRequest(), SendVerifySignResponse.class); + HttpResponse httpResponse = apiClient.post(url, headers, sendVerifySignRequest.toJsonRequest(), SendVerifySignResponse.class); return httpResponse.getServiceResponse(); } } diff --git a/scfs-api-service/src/main/java/com/czcb/scfs/api/service/v1/trans/TransService.java b/scfs-api-service/src/main/java/com/czcb/scfs/api/service/v1/trans/TransService.java index 5238eb8..3aaa18e 100644 --- a/scfs-api-service/src/main/java/com/czcb/scfs/api/service/v1/trans/TransService.java +++ b/scfs-api-service/src/main/java/com/czcb/scfs/api/service/v1/trans/TransService.java @@ -25,28 +25,28 @@ public class TransService { /** * 查询账户交易明细 * - * @param request QueryTradeListRequest + * @param queryTradeListRequest QueryTradeListRequest * @return QueryTradeListResponse */ - public QueryTradeListResponse queryTradeList(QueryTradeListRequest request) { + public QueryTradeListResponse queryTradeList(QueryTradeListRequest queryTradeListRequest) { String url = "/tradeDetails/queryTradeList"; HttpHeaders headers = new HttpHeaders(); headers.addHeader(API_VERSION, V_1); - HttpResponse httpResponse = apiClient.post(url, headers, request.toJsonRequest(), QueryTradeListResponse.class); + HttpResponse httpResponse = apiClient.post(url, headers, queryTradeListRequest.toJsonRequest(), QueryTradeListResponse.class); return httpResponse.getServiceResponse(); } /** * 查询交易流水 * - * @param request QueryTradeInfoRequest + * @param queryTradeInfoRequest QueryTradeInfoRequest * @return QueryTradeInfoResponse */ - public QueryTradeInfoResponse queryTradeInfo(QueryTradeInfoRequest request) { + public QueryTradeInfoResponse queryTradeInfo(QueryTradeInfoRequest queryTradeInfoRequest) { String url = "/tradeDetails/queryTradeInfo"; HttpHeaders headers = new HttpHeaders(); headers.addHeader(API_VERSION, V_1); - HttpResponse httpResponse = apiClient.post(url, headers, request.toJsonRequest(), QueryTradeInfoResponse.class); + HttpResponse httpResponse = apiClient.post(url, headers, queryTradeInfoRequest.toJsonRequest(), QueryTradeInfoResponse.class); return httpResponse.getServiceResponse(); } }