Merge branch 'dev' of http://10.129.135.192:3000/scfs-workspace/scfs-api-sdk into dev

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<ModAccPersonResponse> 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<ModAccCompanyResponse> httpResponse = apiClient.post(url, headers, modAccCompanyRequest.toJsonRequest(), ModAccCompanyResponse.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<QueryCardInfoResponse> httpResponse = apiClient.post(url, headers, queryCardInfoRequest.toJsonRequest(), QueryCardInfoResponse.class);
@@ -218,13 +218,13 @@ public class AccountService {
     }
 
     /**
-     * 绑定账号新增-个人
+     * 个人银行卡绑定
      *
      * @param addPrimAccPersonRequest AddPrimAccRequest
      * @return AddPrimAccResponse
      */
     public AddPrimAccPersonResponse addPrimAccPerson(AddPrimAccPersonRequest addPrimAccPersonRequest) {
-        String url = "/accInfo/addPrimAcc";
+        String url = "/bank-card/v2/person-bind";
         HttpHeaders headers = new HttpHeaders();
         headers.addHeader(API_VERSION, V_1);
         HttpResponse<AddPrimAccPersonResponse> httpResponse = apiClient.post(url, headers, addPrimAccPersonRequest.toJsonRequest(), AddPrimAccPersonResponse.class);
@@ -232,13 +232,13 @@ public class AccountService {
     }
 
     /**
-     * 绑定账号新增-企业
+     * 企业银行账户绑定
      *
      * @param addPrimAccCompanyRequest AddPrimAccPersonRequest
      * @return AddPrimAccPersonResponse
      */
     public AddPrimAccCompanyResponse addPrimAccCompany(AddPrimAccCompanyRequest addPrimAccCompanyRequest) {
-        String url = "/accInfo/addPrimAcc";
+        String url = "/bank-card/v2/company-bind";
         HttpHeaders headers = new HttpHeaders();
         headers.addHeader(API_VERSION, V_1);
         HttpResponse<AddPrimAccCompanyResponse> httpResponse = apiClient.post(url, headers, addPrimAccCompanyRequest.toJsonRequest(), AddPrimAccCompanyResponse.class);
@@ -246,13 +246,13 @@ public class AccountService {
     }
 
     /**
-     * 绑定账号查询
+     * 绑定账卡号查询
      *
      * @param inqPrimAccRequest InqPrimAccRequest
      * @return InqPrimAccResponse
      */
     public InqPrimAccResponse inqPrimAcc(InqPrimAccRequest inqPrimAccRequest) {
-        String url = "/accInfo/inqPrimAcc";
+        String url = "/bank-card/v2/query";
         HttpHeaders headers = new HttpHeaders();
         headers.addHeader(API_VERSION, V_1);
         HttpResponse<InqPrimAccResponse> httpResponse = apiClient.post(url, headers, inqPrimAccRequest.toJsonRequest(), InqPrimAccResponse.class);
@@ -274,13 +274,13 @@ public class AccountService {
     }
 
     /**
-     * 绑定账号删除
+     * 银行账卡号解绑
      *
      * @param delPrimAccRequest DelPrimAccRequest
      * @return DelPrimAccResponse
      */
     public DelPrimAccResponse delPrimAcc(DelPrimAccRequest delPrimAccRequest) {
-        String url = "/accInfo/delPrimAcc";
+        String url = "/bank-card/v2/unbind";
         HttpHeaders headers = new HttpHeaders();
         headers.addHeader(API_VERSION, V_1);
         HttpResponse<DelPrimAccResponse> httpResponse = apiClient.post(url, headers, delPrimAccRequest.toJsonRequest(), DelPrimAccResponse.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<ClosedAccResponse> 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<OpenAccInnerResponse> httpResponse = apiClient.post(url, headers, openAccInnerRequest.toJsonRequest(), OpenAccInnerResponse.class);

scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/account/model/AddPrimAccCompanyRequest.java

@@ -7,14 +7,14 @@ import lombok.Data;
 import lombok.experimental.Accessors;
 
 /**
- * 绑定账号新增-企业
+ * 企业银行账户绑定
  *
  * @author wangwei
  * @since 2.0.0
  */
 @Data
 @Accessors(chain = true)
-@TransType("100014")
+@TransType("223304")
 public class AddPrimAccCompanyRequest implements ApiRequest {
     /**
      * 渠道编号

scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/account/model/AddPrimAccPersonRequest.java

@@ -7,14 +7,14 @@ import lombok.Data;
 import lombok.experimental.Accessors;
 
 /**
- * 绑定账号新增
+ * 个人银行卡绑定
  *
  * @author wangwei
  * @since 2.0.0
  */
 @Data
 @Accessors(chain = true)
-@TransType("100014")
+@TransType("223303")
 public class AddPrimAccPersonRequest implements ApiRequest {
     /**
      * 渠道编号

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;
+
     /**
      * 流水号
      */

scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/account/model/DelPrimAccRequest.java

@@ -7,14 +7,14 @@ import lombok.Data;
 import lombok.experimental.Accessors;
 
 /**
- * 绑定账号删除
+ * 银行账卡号解绑
  *
  * @author wangwei
  * @since 2.0.0
  */
 @Data
 @Accessors(chain = true)
-@TransType("100015")
+@TransType("223305")
 public class DelPrimAccRequest implements ApiRequest {
     /**
      * 渠道编号

scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/account/model/InqPrimAccRequest.java

@@ -7,14 +7,14 @@ import lombok.Data;
 import lombok.experimental.Accessors;
 
 /**
- * 绑定账号查询
+ * 绑定账卡号查询
  *
  * @author wangwei
  * @since 2.0.0
  */
 @Data
 @Accessors(chain = true)
-@TransType("100016")
+@TransType("223306")
 public class InqPrimAccRequest implements ApiRequest {
     /**
      * 渠道编号

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 {
     /**
      * 渠道编号

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 {
     /**
      * 渠道编号

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;
     /**
      * 流水号
      */

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 {
     /**
      * 渠道编号

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 {
     /**
      * 渠道编号

scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/bills/BillService.java

@@ -30,19 +30,33 @@ public class BillService {
     }
 
     /**
-     * 下载对账文件
+     * 回单下载
      *
      * @param returnBillRequest ReturnBillRequest
      * @return ReturnBillResponse
      */
     public ReturnBillResponse returnBill(ReturnBillRequest returnBillRequest) {
-        String url = "/download/returnBill";
+        String url = "/trade-voucher/v2/download-for-base64";
         HttpHeaders headers = new HttpHeaders();
         headers.addHeader(API_VERSION, V_1);
         HttpResponse<ReturnBillResponse> httpResponse = apiClient.post(url, headers, returnBillRequest.toJsonRequest(), ReturnBillResponse.class);
         return httpResponse.getServiceResponse();
     }
 
+    /**
+     * 对账单下载（新模板）
+     *
+     * @param checkBillV2Request CheckBillV2Request
+     * @return CheckBillV2Response
+     */
+    public CheckBillV2Response checkBillV2(CheckBillV2Request checkBillV2Request) {
+        String url = "/download/checkBill";
+        HttpHeaders headers = new HttpHeaders();
+        headers.addHeader(API_VERSION, V_1);
+        HttpResponse<CheckBillV2Response> httpResponse = apiClient.post(url, headers, checkBillV2Request.toJsonRequest(), CheckBillV2Response.class);
+        return httpResponse.getServiceResponse();
+    }
+
     /**
      * 对账单下载
      *
@@ -50,7 +64,7 @@ public class BillService {
      * @return CheckBillResponse
      */
     public CheckBillResponse checkBill(CheckBillRequest checkBillRequest) {
-        String url = "/download/checkBill";
+        String url = "/check-voucher/v1/download-for-base64";
         HttpHeaders headers = new HttpHeaders();
         headers.addHeader(API_VERSION, V_1);
         HttpResponse<CheckBillResponse> httpResponse = apiClient.post(url, headers, checkBillRequest.toJsonRequest(), CheckBillResponse.class);
@@ -64,7 +78,7 @@ public class BillService {
      * @return BalanceBillResponse
      */
     public BalanceBillResponse balanceBill(BalanceBillRequest balanceBillRequest) {
-        String url = "/download/balanceBill";
+        String url = "/balance-voucher/v2/download-for-base64";
         HttpHeaders headers = new HttpHeaders();
         headers.addHeader(API_VERSION, V_1);
         HttpResponse<BalanceBillResponse> httpResponse = apiClient.post(url, headers, balanceBillRequest.toJsonRequest(), BalanceBillResponse.class);

scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/bills/model/BalanceBillRequest.java

@@ -12,7 +12,7 @@ import lombok.experimental.Accessors;
  */
 @Data
 @Accessors(chain = true)
-@TransType("100037")
+@TransType("223212")
 public class BalanceBillRequest implements ApiRequest {
     /**
      * 渠道编号

scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/bills/model/CheckBillRequest.java

@@ -8,7 +8,7 @@ import lombok.experimental.Accessors;
 
 @Data
 @Accessors(chain = true)
-@TransType("100028")
+@TransType("231312")
 public class CheckBillRequest implements ApiRequest {
     /**
      * 渠道编号

scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/bills/model/CheckBillV2Request.java

@@ -0,0 +1,72 @@
+package com.czcb.scfs.api.service.v2.bills.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;
+
+@Data
+@Accessors(chain = true)
+@TransType("231313")
+public class CheckBillV2Request implements ApiRequest {
+    /**
+     * 渠道编号
+     */
+    @SerializedName("channel_no")
+    private String channelNo;
+
+    /**
+     * 应用编号
+     */
+    @SerializedName("app_no")
+    private String appNo;
+
+    /**
+     * 流水号
+     */
+    @SerializedName("serial_no")
+    private String serialNo;
+
+    /**
+     * 下账号
+     */
+    @SerializedName("account_no")
+    private String accountNo;
+
+    /**
+     * 开始日期YYYY-MM-DD
+     */
+    @SerializedName("start_date")
+    private String startDate;
+
+    /**
+     * 结束日期YYYY-MM-DD
+     */
+    @SerializedName("end_date")
+    private String endDate;
+
+    /**
+     * 操作日期
+     */
+    @SerializedName("trans_date")
+    private String transDate;
+
+    /**
+     * 操作时间
+     */
+    @SerializedName("trans_tradetime")
+    private String transTradeTime;
+
+    /**
+     * 当前页码 默认 0
+     */
+    @SerializedName("current_page")
+    private String currentPage;
+
+    /**
+     * 每页行数 默认 100
+     */
+    @SerializedName("current_rows")
+    private String currentRows;
+}

scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/bills/model/CheckBillV2Response.java

@@ -0,0 +1,40 @@
+package com.czcb.scfs.api.service.v2.bills.model;
+
+import com.czcb.scfs.api.core.ApiResponse;
+import com.google.gson.annotations.SerializedName;
+import lombok.Data;
+import lombok.experimental.Accessors;
+
+@Data
+@Accessors(chain = true)
+public class CheckBillV2Response implements ApiResponse {
+    /**
+     * 000000：表示成功
+     */
+    @SerializedName("recode")
+    private String recode;
+
+    /**
+     * 结果信息
+     */
+    @SerializedName("recode_info")
+    private String recodeInfo;
+
+    /**
+     * base64编码的zip文件
+     */
+    @SerializedName("file_data")
+    private String fileData;
+
+    /**
+     * 系统日期（YYYY-MM-DD）
+     */
+    @SerializedName("sys_date")
+    private String sysDate;
+
+    /**
+     * 系统时间（YYYY-MM-DD hh:mm:ss）
+     */
+    @SerializedName("sys_time")
+    private String sysTime;
+}

scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/bills/model/ReturnBillRequest.java

@@ -11,7 +11,7 @@ import lombok.experimental.Accessors;
  */
 @Data
 @Accessors(chain = true)
-@TransType("100027")
+@TransType("231311")
 public class ReturnBillRequest implements ApiRequest {
     /**
      * 渠道编号

scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/bmd/BmdService.java

@@ -20,13 +20,13 @@ public class BmdService {
     }
 
     /**
-     * 白名单新增
+     * 来账白名单新增
      *
      * @param bmdAddRequest BmdAddRequest
      * @return BmdAddResponse
      */
     public BmdAddResponse bmdAdd(BmdAddRequest bmdAddRequest) {
-        String url = "/bmdManager/bmdAdd";
+        String url = "/bmd-manager/v2/add";
         HttpHeaders headers = new HttpHeaders();
         headers.addHeader(API_VERSION, V_1);
         HttpResponse<BmdAddResponse> httpResponse = apiClient.post(url, headers, bmdAddRequest.toJsonRequest(), BmdAddResponse.class);
@@ -34,13 +34,13 @@ public class BmdService {
     }
 
     /**
-     * 白名单删除
+     * 来账白名单删除
      *
      * @param bmdDelRequest BmdDelRequest
      * @return BmdDelResponse
      */
     public BmdDelResponse bmdDel(BmdDelRequest bmdDelRequest) {
-        String url = "/bmdManager/bmdDel";
+        String url = "/bmd-manager/v2/del";
         HttpHeaders headers = new HttpHeaders();
         headers.addHeader(API_VERSION, V_1);
         HttpResponse<BmdDelResponse> httpResponse = apiClient.post(url, headers, bmdDelRequest.toJsonRequest(), BmdDelResponse.class);
@@ -54,7 +54,7 @@ public class BmdService {
      * @return BmdListResponse
      */
     public BmdListResponse bmdList(BmdListRequest bmdListRequest) {
-        String url = "/bmdManager/bmdList";
+        String url = "/bmd-manager/v2/query";
         HttpHeaders headers = new HttpHeaders();
         headers.addHeader(API_VERSION, V_1);
         HttpResponse<BmdListResponse> httpResponse = apiClient.post(url, headers, bmdListRequest.toJsonRequest(), BmdListResponse.class);

scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/bmd/model/BmdAddRequest.java

@@ -12,7 +12,7 @@ import lombok.experimental.Accessors;
  */
 @Data
 @Accessors(chain = true)
-@TransType("100023")
+@TransType("231403")
 public class BmdAddRequest implements ApiRequest {
     /**
      * 渠道编号

scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/bmd/model/BmdDelRequest.java

@@ -12,7 +12,7 @@ import lombok.experimental.Accessors;
  */
 @Data
 @Accessors(chain = true)
-@TransType("100024")
+@TransType("231404")
 public class BmdDelRequest implements ApiRequest {
     /**
      * 渠道编号

scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/bmd/model/BmdListRequest.java

@@ -12,7 +12,7 @@ import lombok.experimental.Accessors;
  */
 @Data
 @Accessors(chain = true)
-@TransType("100025")
+@TransType("231405")
 public class BmdListRequest implements ApiRequest {
     /**
      * 渠道编号

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<FaceFileResponse> httpResponse = apiClient.post(url, headers, faceFileRequest.toJsonRequest(), FaceFileResponse.class);

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 {
     /**
      * 渠道编号

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<UploadFileResponse> 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<DownloadFileResponse> httpResponse = apiClient.post(url, headers, request.toJsonRequest(), DownloadFileResponse.class);

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")
+        @SerializedName("file_no")
-        private String fileData;
+        private String fileNo;
     }
 }

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;
     /**
      * 流水号
      */

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<OcrFileResponse> httpResponse = apiClient.post(url, headers, ocrFileRequest.toJsonRequest(), OcrFileResponse.class);

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 {
     /**
      * 渠道编号

scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/pay/PayService.java

@@ -26,7 +26,7 @@ public class PayService {
      * @return MerWithdrawResponse
      */
     public MerWithdrawResponse withdraw(MerWithdrawRequest merWithdrawRequest) {
-        String url = "/merTrade/mer_withdraw";
+        String url = "/mer-trade/v2/withdraw";
         HttpHeaders headers = new HttpHeaders();
         headers.addHeader(API_VERSION, V_1);
         HttpResponse<MerWithdrawResponse> httpResponse = apiClient.post(url, headers, merWithdrawRequest.toJsonRequest(), MerWithdrawResponse.class);
@@ -34,13 +34,13 @@ public class PayService {
     }
 
     /**
-     * 提现
+     * 提现（平台专用）
      *
      * @param merWithdrawV2Request MerWithdrawV2Request
      * @return MerWithdrawV2Response
      */
     public MerWithdrawV2Response merWithdrawV2(MerWithdrawV2Request merWithdrawV2Request) {
-        String url = "/merTrade/mer_withdraw_v2";
+        String url = "/mer-trade/v2/withdraw-for-platform";
         HttpHeaders headers = new HttpHeaders();
         headers.addHeader(API_VERSION, V_1);
         HttpResponse<MerWithdrawV2Response> httpResponse = apiClient.post(url, headers, merWithdrawV2Request.toJsonRequest(), MerWithdrawV2Response.class);
@@ -54,7 +54,7 @@ public class PayService {
      * @return MerWithdrawCheckResponse
      */
     public MerWithdrawCheckResponse withdrawCheck(MerWithdrawCheckRequest merWithdrawCheckRequest) {
-        String url = "/merTrade/mer_withdraw_check";
+        String url = "/mer-trade/v2/withdraw-check";
         HttpHeaders headers = new HttpHeaders();
         headers.addHeader(API_VERSION, V_1);
         HttpResponse<MerWithdrawCheckResponse> httpResponse = apiClient.post(url, headers, merWithdrawCheckRequest.toJsonRequest(), MerWithdrawCheckResponse.class);
@@ -68,7 +68,7 @@ public class PayService {
      * @return MerDepositResponse
      */
     public MerDepositResponse deposit(MerDepositRequest merDepositRequest) {
-        String url = "/merTrade/mer_deposit";
+        String url = "/mer-trade/v2/deposit";
         HttpHeaders headers = new HttpHeaders();
         headers.addHeader(API_VERSION, V_1);
         HttpResponse<MerDepositResponse> httpResponse = apiClient.post(url, headers, merDepositRequest.toJsonRequest(), MerDepositResponse.class);
@@ -82,7 +82,7 @@ public class PayService {
      * @return MerDepositCheckResponse
      */
     public MerDepositCheckResponse depositCheck(MerDepositCheckRequest merDepositCheckRequest) {
-        String url = "/merTrade/mer_deposit_check";
+        String url = "/mer-trade/v2/deposit-check";
         HttpHeaders headers = new HttpHeaders();
         headers.addHeader(API_VERSION, V_1);
         HttpResponse<MerDepositCheckResponse> httpResponse = apiClient.post(url, headers, merDepositCheckRequest.toJsonRequest(), MerDepositCheckResponse.class);

scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/pay/model/MerDepositCheckRequest.java

@@ -14,7 +14,7 @@ import lombok.experimental.Accessors;
  */
 @Data
 @Accessors(chain = true)
-@TransType("100021")
+@TransType("231002")
 public class MerDepositCheckRequest implements ApiRequest {
     /**
      * 渠道编号

scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/pay/model/MerDepositRequest.java

@@ -16,7 +16,7 @@ import java.math.BigDecimal;
  */
 @Data
 @Accessors(chain = true)
-@TransType("100020")
+@TransType("231001")
 public class MerDepositRequest implements ApiRequest {
     /**
      * 渠道编号

scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/pay/model/MerWithdrawCheckRequest.java

@@ -14,7 +14,7 @@ import lombok.experimental.Accessors;
  */
 @Data
 @Accessors(chain = true)
-@TransType("100019")
+@TransType("231102")
 public class MerWithdrawCheckRequest implements ApiRequest {
     /**
      * 渠道编号

scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/pay/model/MerWithdrawRequest.java

@@ -16,7 +16,7 @@ import java.math.BigDecimal;
  */
 @Data
 @Accessors(chain = true)
-@TransType("100018")
+@TransType("231101")
 public class MerWithdrawRequest implements ApiRequest {
     /**
      * 渠道编号

scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/pay/model/MerWithdrawV2Request.java

@@ -14,7 +14,7 @@ import java.math.BigDecimal;
  */
 @Data
 @Accessors(chain = true)
-@TransType("100035")
+@TransType("231103")
 public class MerWithdrawV2Request implements ApiRequest {
     /**
      * 渠道编号

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<QueryTradeListNewResponse> httpResponse = apiClient.post(url, headers, queryTradeListNewRequest.toJsonRequest(), QueryTradeListNewResponse.class);

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;
 
     /**