ref: 受托支付位置调整

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<EntpayagrtAddResponse> 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<EntpayagrtDelResponse> 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<EntpayagrtQueryListResponse> httpResponse = apiClient.post(url, headers, entpayagrtQueryListRequest.toJsonRequest(), EntpayagrtQueryListResponse.class);
-        return httpResponse.getServiceResponse();
-    }
     /**
      * 开户（内部户）
      *

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

@@ -56,4 +56,18 @@ public class BillService {
         HttpResponse<CheckBillResponse> 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<BalanceBillResponse> httpResponse = apiClient.post(url, headers, balanceBillRequest.toJsonRequest(), BalanceBillResponse.class);
+        return httpResponse.getServiceResponse();
+    }
 }

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;

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;

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<DownloadFileResponse> 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<BalanceBillResponse> httpResponse = apiClient.post(url, headers, balanceBillRequest.toJsonRequest(), BalanceBillResponse.class);
-        return httpResponse.getServiceResponse();
-    }
 }

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

@@ -131,4 +131,46 @@ public class PayService {
         HttpResponse<EarnestReleaseResponse> 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<EntPayAgrtAddResponse> 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<EntPayAgrtDelResponse> 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<EntPayAgrtQueryListResponse> httpResponse = apiClient.post(url, headers, entPayAgrtQueryListRequest.toJsonRequest(), EntPayAgrtQueryListResponse.class);
+        return httpResponse.getServiceResponse();
+    }
 }

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

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：表示成功，才有基础要素输出
      */

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

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：表示成功，才有基础要素输出
      */

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

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 {