diff --git a/scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/account/AccountService.java b/scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/account/AccountService.java index 4bdba69..fa2fc2e 100644 --- a/scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/account/AccountService.java +++ b/scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/account/AccountService.java @@ -154,7 +154,7 @@ public class AccountService { * @return ModAccResponse */ public ModAccPersonResponse modAccPerson(ModAccPersonRequest modAccPersonRequest) { - String url = "/accInfo/modAcc"; + String url = "/account/v2/person-mod-account"; HttpHeaders headers = new HttpHeaders(); headers.addHeader(API_VERSION, V_1); HttpResponse httpResponse = apiClient.post(url, headers, modAccPersonRequest.toJsonRequest(), ModAccPersonResponse.class); @@ -168,7 +168,7 @@ public class AccountService { * @return ModAccCompanyResponse */ public ModAccCompanyResponse modAccCompany(ModAccCompanyRequest modAccCompanyRequest) { - String url = "/accInfo/modAcc"; + String url = "/account/v2/company-mod-account"; HttpHeaders headers = new HttpHeaders(); headers.addHeader(API_VERSION, V_1); HttpResponse httpResponse = apiClient.post(url, headers, modAccCompanyRequest.toJsonRequest(), ModAccCompanyResponse.class); @@ -182,7 +182,7 @@ public class AccountService { * @return QueryBalanceResponse */ public QueryBalanceResponse queryBalance(QueryBalanceRequest queryBalanceRequest) { - String url = "/accInfo/queryBalance"; + String url = "/account/v2/query-balance"; HttpHeaders headers = new HttpHeaders(); headers.addHeader(API_VERSION, V_1); HttpResponse httpResponse = apiClient.post(url, headers, queryBalanceRequest.toJsonRequest(), QueryBalanceResponse.class); @@ -210,7 +210,7 @@ public class AccountService { * @return QueryCardInfoResponse */ public QueryCardInfoResponse queryCardInfo(QueryCardInfoRequest queryCardInfoRequest) { - String url = "/accInfo/queryCardInfo"; + String url = "/card-bin/v2/query"; HttpHeaders headers = new HttpHeaders(); headers.addHeader(API_VERSION, V_1); HttpResponse httpResponse = apiClient.post(url, headers, queryCardInfoRequest.toJsonRequest(), QueryCardInfoResponse.class); @@ -294,7 +294,7 @@ public class AccountService { * @return ClosedAccResponse */ public ClosedAccResponse closedAcc(ClosedAccRequest closedAccRequest) { - String url = "/accInfo/closedAcc"; + String url = "/account/v2/closed-account"; HttpHeaders headers = new HttpHeaders(); headers.addHeader(API_VERSION, V_1); HttpResponse httpResponse = apiClient.post(url, headers, closedAccRequest.toJsonRequest(), ClosedAccResponse.class); @@ -308,7 +308,7 @@ public class AccountService { * @return EntpayagrtDelResponse */ public OpenAccInnerResponse openAccInner(OpenAccInnerRequest openAccInnerRequest) { - String url = "/accInfo/openAccInner"; + String url = "/account/v2/inner-open-account"; HttpHeaders headers = new HttpHeaders(); headers.addHeader(API_VERSION, V_1); HttpResponse httpResponse = apiClient.post(url, headers, openAccInnerRequest.toJsonRequest(), OpenAccInnerResponse.class); diff --git a/scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/account/model/ClosedAccRequest.java b/scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/account/model/ClosedAccRequest.java index d09ac4a..fabf06d 100644 --- a/scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/account/model/ClosedAccRequest.java +++ b/scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/account/model/ClosedAccRequest.java @@ -12,7 +12,7 @@ import lombok.experimental.Accessors; */ @Data @Accessors(chain = true) -@TransType("100026") +@TransType("222601") public class ClosedAccRequest implements ApiRequest { /** * 渠道编号 @@ -26,6 +26,12 @@ public class ClosedAccRequest implements ApiRequest { @SerializedName("app_no") private String appNo; + /** + * 账号 + */ + @SerializedName("account_no") + private String accountNo; + /** * 流水号 */ diff --git a/scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/account/model/ModAccCompanyRequest.java b/scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/account/model/ModAccCompanyRequest.java index f33d715..0520bfa 100644 --- a/scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/account/model/ModAccCompanyRequest.java +++ b/scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/account/model/ModAccCompanyRequest.java @@ -15,7 +15,7 @@ import java.util.List; */ @Data @Accessors(chain = true) -@TransType("100003") +@TransType("222404") public class ModAccCompanyRequest implements ApiRequest { /** * 渠道编号 diff --git a/scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/account/model/ModAccPersonRequest.java b/scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/account/model/ModAccPersonRequest.java index 45a0ed4..df762d7 100644 --- a/scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/account/model/ModAccPersonRequest.java +++ b/scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/account/model/ModAccPersonRequest.java @@ -15,7 +15,7 @@ import java.util.List; */ @Data @Accessors(chain = true) -@TransType("100003") +@TransType("222403") public class ModAccPersonRequest implements ApiRequest { /** * 渠道编号 diff --git a/scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/account/model/OpenAccInnerRequest.java b/scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/account/model/OpenAccInnerRequest.java index 072a041..ad494cc 100644 --- a/scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/account/model/OpenAccInnerRequest.java +++ b/scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/account/model/OpenAccInnerRequest.java @@ -14,13 +14,18 @@ import lombok.experimental.Accessors; */ @Data @Accessors(chain = true) -@TransType("100038") +@TransType("222105") public class OpenAccInnerRequest implements ApiRequest { /** * 渠道编号 */ @SerializedName("channel_no") private String channelNo; + /** + * 应用编号 + */ + @SerializedName("app_no") + private String appNo; /** * 流水号 */ diff --git a/scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/account/model/QueryBalanceRequest.java b/scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/account/model/QueryBalanceRequest.java index 73f9503..9f235c8 100644 --- a/scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/account/model/QueryBalanceRequest.java +++ b/scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/account/model/QueryBalanceRequest.java @@ -12,7 +12,7 @@ import lombok.experimental.Accessors; */ @Data @Accessors(chain = true) -@TransType("100004") +@TransType("222201") public class QueryBalanceRequest implements ApiRequest { /** * 渠道编号 diff --git a/scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/account/model/QueryCardInfoRequest.java b/scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/account/model/QueryCardInfoRequest.java index aa5e710..bbb74b9 100644 --- a/scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/account/model/QueryCardInfoRequest.java +++ b/scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/account/model/QueryCardInfoRequest.java @@ -12,7 +12,7 @@ import lombok.experimental.Accessors; */ @Data @Accessors(chain = true) -@TransType("100025") +@TransType("223405") public class QueryCardInfoRequest implements ApiRequest { /** * 渠道编号 diff --git a/scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/face/FaceService.java b/scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/face/FaceService.java index 7e66171..1754012 100644 --- a/scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/face/FaceService.java +++ b/scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/face/FaceService.java @@ -28,7 +28,7 @@ public class FaceService { * @return FaceFileResponse */ public FaceFileResponse face(FaceFileRequest faceFileRequest) { - String url = "/face/imageRecognize"; + String url = "/face/v2/recognize-for-base64"; HttpHeaders headers = new HttpHeaders(); headers.addHeader(API_VERSION, V_1); HttpResponse httpResponse = apiClient.post(url, headers, faceFileRequest.toJsonRequest(), FaceFileResponse.class); diff --git a/scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/face/model/FaceFileRequest.java b/scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/face/model/FaceFileRequest.java index 2ba4ffe..33e5d3f 100644 --- a/scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/face/model/FaceFileRequest.java +++ b/scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/face/model/FaceFileRequest.java @@ -14,7 +14,7 @@ import lombok.experimental.Accessors; */ @Data @Accessors(chain = true) -@TransType("100008") +@TransType("222005") public class FaceFileRequest implements ApiRequest { /** * 渠道编号 diff --git a/scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/file/FileService.java b/scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/file/FileService.java index 965746f..d79c2f2 100644 --- a/scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/file/FileService.java +++ b/scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/file/FileService.java @@ -30,7 +30,7 @@ public class FileService { * @return UploadFileResponse */ public UploadFileResponse uploadFile(UploadFileRequest uploadFileRequest) { - String url = "/upload/uploadFile"; + String url = "/file/v2/upload-for-base64"; HttpHeaders headers = new HttpHeaders(); headers.addHeader(API_VERSION, V_1); HttpResponse httpResponse = apiClient.post(url, headers, uploadFileRequest.toJsonRequest(), UploadFileResponse.class); @@ -44,7 +44,7 @@ public class FileService { * @return DownloadFileResponse */ public DownloadFileResponse downloadFile(DownloadFileRequest request) { - String url = "/upload/downloadFile"; + String url = "/file/v2/download-for-base64"; HttpHeaders headers = new HttpHeaders(); headers.addHeader(API_VERSION, V_1); HttpResponse httpResponse = apiClient.post(url, headers, request.toJsonRequest(), DownloadFileResponse.class); diff --git a/scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/file/model/DownloadFileRequest.java b/scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/file/model/DownloadFileRequest.java index 789bc4b..7ff0801 100644 --- a/scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/file/model/DownloadFileRequest.java +++ b/scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/file/model/DownloadFileRequest.java @@ -15,14 +15,18 @@ import java.util.List; */ @Data @Accessors(chain = true) -@TransType("100010") +@TransType("221711") public class DownloadFileRequest implements ApiRequest { /** * 渠道编号 */ @SerializedName("channel_no") private String channelNo; - + /** + * 应用编号 + */ + @SerializedName("app_no") + private String appNo; /** * 流水号 */ @@ -55,7 +59,7 @@ public class DownloadFileRequest implements ApiRequest { /** * base64编码的zip文件 */ - @SerializedName("file_data") - private String fileData; + @SerializedName("file_no") + private String fileNo; } } diff --git a/scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/file/model/UploadFileRequest.java b/scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/file/model/UploadFileRequest.java index 0d718fe..3ec7ee4 100644 --- a/scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/file/model/UploadFileRequest.java +++ b/scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/file/model/UploadFileRequest.java @@ -15,14 +15,18 @@ import java.util.List; */ @Data @Accessors(chain = true) -@TransType("100009") +@TransType("221710") public class UploadFileRequest implements ApiRequest { /** * 渠道编号 */ @SerializedName("channel_no") private String channelNo; - + /** + * 应用编号 + */ + @SerializedName("app_no") + private String appNo; /** * 流水号 */ diff --git a/scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/ocr/OcrService.java b/scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/ocr/OcrService.java index 634f570..734ae24 100644 --- a/scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/ocr/OcrService.java +++ b/scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/ocr/OcrService.java @@ -27,7 +27,7 @@ public class OcrService { * @return OcrFileResponse */ public OcrFileResponse imageRecognize(OcrFileRequest ocrFileRequest) { - String url = "/ocr/imageRecognize"; + String url = "/ocr/v2/recognize-for-base64"; HttpHeaders headers = new HttpHeaders(); headers.addHeader(API_VERSION, V_1); HttpResponse httpResponse = apiClient.post(url, headers, ocrFileRequest.toJsonRequest(), OcrFileResponse.class); diff --git a/scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/ocr/model/OcrFileRequest.java b/scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/ocr/model/OcrFileRequest.java index 30582df..4bd42a1 100644 --- a/scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/ocr/model/OcrFileRequest.java +++ b/scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/ocr/model/OcrFileRequest.java @@ -12,7 +12,7 @@ import lombok.experimental.Accessors; */ @Data @Accessors(chain = true) -@TransType("100007") +@TransType("221905") public class OcrFileRequest implements ApiRequest { /** * 渠道编号 diff --git a/scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/trans/TransService.java b/scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/trans/TransService.java index 124e993..20717f6 100644 --- a/scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/trans/TransService.java +++ b/scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/trans/TransService.java @@ -48,13 +48,13 @@ public class TransService { } /** - * 查询账户交易明细(新1) + * 查询账户交易明细 * * @param queryTradeListNewRequest QueryTradeListNewRequest * @return QueryTradeListNewResponse */ public QueryTradeListNewResponse queryTradeListNew(QueryTradeListNewRequest queryTradeListNewRequest) { - String url = "/tradeDetails/queryTradeList1"; + String url = "/trade-details/v2/query"; HttpHeaders headers = new HttpHeaders(); headers.addHeader(API_VERSION, V_1); HttpResponse httpResponse = apiClient.post(url, headers, queryTradeListNewRequest.toJsonRequest(), QueryTradeListNewResponse.class); diff --git a/scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/trans/model/QueryTradeListNewRequest.java b/scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/trans/model/QueryTradeListNewRequest.java index ac6ffb5..7d9f379 100644 --- a/scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/trans/model/QueryTradeListNewRequest.java +++ b/scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/trans/model/QueryTradeListNewRequest.java @@ -12,7 +12,7 @@ import lombok.experimental.Accessors; */ @Data @Accessors(chain = true) -@TransType("100033") +@TransType("230303") public class QueryTradeListNewRequest implements ApiRequest { /** * 渠道编号 @@ -65,7 +65,7 @@ public class QueryTradeListNewRequest implements ApiRequest { /** * 操作日期 */ - @SerializedName("original_serialno") + @SerializedName("trans_date") private String transDate; /**