feat：pay及肥猫受托支付协议列表V2接口添加字段（协议类型）

scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/cat/project/model/EntpayAgrtQueryRequest.java

@@ -52,6 +52,12 @@ public class EntpayAgrtQueryRequest implements ApiRequest {
     @SerializedName("file_no")
     private String fileNo;
 
+    /**
+     * 协议类型
+     */
+    @SerializedName("contract_type")
+    private String contractType;
+
     /**
      * 付款账户账号
      */

scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/cat/project/model/EntpayAgrtQueryResponse.java

@@ -59,6 +59,12 @@ public class EntpayAgrtQueryResponse implements ApiResponse {
         @SerializedName("file_no")
         private String fileNo;
 
+        /**
+         * 协议类型
+         */
+        @SerializedName("contract_type")
+        private String contractType;
+
         /**
          * 付款账户账号
          */

scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/entpay/model/EntPayAgrtQueryListRequest.java

@@ -52,6 +52,12 @@ public class EntPayAgrtQueryListRequest implements ApiRequest {
     @SerializedName("file_no")
     private String  fileNo;
 
+    /**
+     * 协议类型
+     */
+    @SerializedName("contract_type")
+    private String contractType;
+
     /**
      * 付款账户账号（经销商A1）
      */

scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/entpay/model/EntPayAgrtQueryListResponse.java

@@ -61,6 +61,12 @@ public class EntPayAgrtQueryListResponse implements ApiResponse {
         @SerializedName("file_no")
         private String  fileNo;
 
+        /**
+         * 协议类型
+         */
+        @SerializedName("contract_type")
+        private String contractType;
+
         /**
          * 付款账户账号
          */

scfs-api-service/src/test/java/com/czcb/scfs/api/service/v2/cat/project/ProjectServiceTest.java

@@ -699,7 +699,7 @@ class ProjectServiceTest {
 
         String requestJson = Json.toJson(request);
 
-        Assertions.assertEquals("{\"channel_no\":\"setChannelNo\",\"app_no\":\"setAppNo\",\"serial_no\":\"setSerialNo\",\"trans_date\":\"setTransDate\",\"trans_tradetime\":\"setTransTradeTime\",\"file_no\":\"setFileNo\",\"account_no\":\"setAccountNo\",\"account_name\":\"setAccountName\",\"start_date\":\"setStartDate\",\"end_date\":\"setEndDate\"}", requestJson);
+        Assertions.assertEquals("{\"channel_no\":\"setChannelNo\",\"app_no\":\"setAppNo\",\"serial_no\":\"setSerialNo\",\"trans_date\":\"setTransDate\",\"trans_tradetime\":\"setTransTradeTime\",\"file_no\":\"setFileNo\",\"contract_type\":\"setContractType\",\"account_no\":\"setAccountNo\",\"account_name\":\"setAccountName\",\"start_date\":\"setStartDate\",\"end_date\":\"setEndDate\"}", requestJson);
 
         EntpayAgrtQueryResponse response = new EntpayAgrtQueryResponse();
         extractedEntpayAgrtQueryResponseParams(response);
@@ -707,7 +707,7 @@ class ProjectServiceTest {
 
         String responseJson = Json.toJson(response);
 
-        Assertions.assertEquals("{\"recode\":\"setRecode\",\"recode_info\":\"setRecodeInfo\",\"sys_serial_no\":\"setSysSerialNo\",\"sys_date\":\"setSysDate\",\"sys_time\":\"setSysTime\",\"recode_list\":[{\"file_no\":\"setFileNo\",\"account_no\":\"setAccountNo\",\"account_name\":\"setAccountName\",\"opp_account_no\":\"setOppAccountNo\",\"opp_account_name\":\"setOppAccountName\",\"opp_bank_no\":\"setOppBankNo\",\"opp_bank_name\":\"setOppBankName\",\"opp_account_no_1\":\"setOppAccountNo1\",\"opp_account_name_1\":\"setOppAccountName1\",\"opp_bank_no_1\":\"setOppBankNo1\",\"opp_bank_name_1\":\"setOppBankName1\",\"note\":\"setNote\",\"check_status\":\"setCheckStatus\",\"check_time\":\"setCheckTime\",\"check_remark\":\"setCheckRemark\"}]}", responseJson);
+        Assertions.assertEquals("{\"recode\":\"setRecode\",\"recode_info\":\"setRecodeInfo\",\"sys_serial_no\":\"setSysSerialNo\",\"sys_date\":\"setSysDate\",\"sys_time\":\"setSysTime\",\"recode_list\":[{\"file_no\":\"setFileNo\",\"contract_type\":\"setContractType\",\"account_no\":\"setAccountNo\",\"account_name\":\"setAccountName\",\"opp_account_no\":\"setOppAccountNo\",\"opp_account_name\":\"setOppAccountName\",\"opp_bank_no\":\"setOppBankNo\",\"opp_bank_name\":\"setOppBankName\",\"opp_account_no_1\":\"setOppAccountNo1\",\"opp_account_name_1\":\"setOppAccountName1\",\"opp_bank_no_1\":\"setOppBankNo1\",\"opp_bank_name_1\":\"setOppBankName1\",\"note\":\"setNote\",\"check_status\":\"setCheckStatus\",\"check_time\":\"setCheckTime\",\"check_remark\":\"setCheckRemark\"}]}", responseJson);
 
         HttpResponse<EntpayAgrtQueryResponse> httpResponse = MockHttpResponse.create("/entpay/agrt-query", response, EntpayAgrtQueryResponse.class);
         Mockito.when(apiClient.post(
@@ -721,7 +721,7 @@ class ProjectServiceTest {
 
 
         String resultJson = Json.toJson(result);
-        Assertions.assertEquals("{\"recode\":\"setRecode\",\"recode_info\":\"setRecodeInfo\",\"sys_serial_no\":\"setSysSerialNo\",\"sys_date\":\"setSysDate\",\"sys_time\":\"setSysTime\",\"recode_list\":[{\"file_no\":\"setFileNo\",\"account_no\":\"setAccountNo\",\"account_name\":\"setAccountName\",\"opp_account_no\":\"setOppAccountNo\",\"opp_account_name\":\"setOppAccountName\",\"opp_bank_no\":\"setOppBankNo\",\"opp_bank_name\":\"setOppBankName\",\"opp_account_no_1\":\"setOppAccountNo1\",\"opp_account_name_1\":\"setOppAccountName1\",\"opp_bank_no_1\":\"setOppBankNo1\",\"opp_bank_name_1\":\"setOppBankName1\",\"note\":\"setNote\",\"check_status\":\"setCheckStatus\",\"check_time\":\"setCheckTime\",\"check_remark\":\"setCheckRemark\"}]}", resultJson);
+        Assertions.assertEquals("{\"recode\":\"setRecode\",\"recode_info\":\"setRecodeInfo\",\"sys_serial_no\":\"setSysSerialNo\",\"sys_date\":\"setSysDate\",\"sys_time\":\"setSysTime\",\"recode_list\":[{\"file_no\":\"setFileNo\",\"contract_type\":\"setContractType\",\"account_no\":\"setAccountNo\",\"account_name\":\"setAccountName\",\"opp_account_no\":\"setOppAccountNo\",\"opp_account_name\":\"setOppAccountName\",\"opp_bank_no\":\"setOppBankNo\",\"opp_bank_name\":\"setOppBankName\",\"opp_account_no_1\":\"setOppAccountNo1\",\"opp_account_name_1\":\"setOppAccountName1\",\"opp_bank_no_1\":\"setOppBankNo1\",\"opp_bank_name_1\":\"setOppBankName1\",\"note\":\"setNote\",\"check_status\":\"setCheckStatus\",\"check_time\":\"setCheckTime\",\"check_remark\":\"setCheckRemark\"}]}", resultJson);
     }
 
     void extractedEntpayAgrtQueryRequestParams(EntpayAgrtQueryRequest request) {
@@ -732,6 +732,7 @@ class ProjectServiceTest {
         request.setAppNo("setAppNo");
         request.setAccountNo("setAccountNo");
         request.setFileNo("setFileNo");
+        request.setContractType("setContractType");
         request.setStartDate("setStartDate");
         request.setEndDate("setEndDate");
         request.setTransTradeTime("setTransTradeTime");
@@ -745,6 +746,7 @@ class ProjectServiceTest {
         Assertions.assertEquals("setAppNo", request.getAppNo());
         Assertions.assertEquals("setAccountNo", request.getAccountNo());
         Assertions.assertEquals("setFileNo", request.getFileNo());
+        Assertions.assertEquals("setContractType", request.getContractType());
         Assertions.assertEquals("setStartDate", request.getStartDate());
         Assertions.assertEquals("setEndDate", request.getEndDate());
         Assertions.assertEquals("setTransTradeTime", request.getTransTradeTime());
@@ -763,6 +765,7 @@ class ProjectServiceTest {
 
     void extractedRecodeListNestParams(EntpayAgrtQueryResponse.RecodeList nest) {
         nest.setFileNo("setFileNo");
+        nest.setContractType("setContractType");
         nest.setAccountNo("setAccountNo");
         nest.setOppAccountNo("setOppAccountNo");
         nest.setOppBankNo("setOppBankNo");
@@ -781,6 +784,7 @@ class ProjectServiceTest {
 
     void extractedRecodeListNestAssertions(EntpayAgrtQueryResponse.RecodeList nest) {
         Assertions.assertEquals("setFileNo", nest.getFileNo());
+        Assertions.assertEquals("setContractType", nest.getContractType());
         Assertions.assertEquals("setAccountNo", nest.getAccountNo());
         Assertions.assertEquals("setOppAccountNo", nest.getOppAccountNo());
         Assertions.assertEquals("setOppBankNo", nest.getOppBankNo());

scfs-api-service/src/test/java/com/czcb/scfs/api/service/v2/entpay/EntPayServiceTest.java

@@ -190,7 +190,7 @@ class EntPayServiceTest {
 
         System.out.println(Json.toJson(request));
         String requestJson = Json.toJson(request);
-        Assertions.assertEquals("{\"channel_no\":\"setChannelNo\",\"app_no\":\"setAppNo\",\"serial_no\":\"setSerialNo\",\"trans_date\":\"setTransDate\",\"trans_tradetime\":\"setTransTradeTime\",\"file_no\":\"setFileNo\",\"account_no\":\"setAccountNo\",\"account_name\":\"setAccountName\",\"start_date\":\"setStartDate\",\"end_date\":\"setEndDate\"}", requestJson);
+        Assertions.assertEquals("{\"channel_no\":\"setChannelNo\",\"app_no\":\"setAppNo\",\"serial_no\":\"setSerialNo\",\"trans_date\":\"setTransDate\",\"trans_tradetime\":\"setTransTradeTime\",\"file_no\":\"setFileNo\",\"contract_type\":\"setContractType\",\"account_no\":\"setAccountNo\",\"account_name\":\"setAccountName\",\"start_date\":\"setStartDate\",\"end_date\":\"setEndDate\"}", requestJson);
 
         EntPayAgrtQueryListResponse response = new EntPayAgrtQueryListResponse();
         extractedEntPayAgrtQueryListResponseParams(response);
@@ -198,7 +198,7 @@ class EntPayServiceTest {
 
         System.out.println(Json.toJson(response));
         String responseJson = Json.toJson(response);
-        Assertions.assertEquals("{\"recode\":\"setRecode\",\"recode_info\":\"setRecodeInfo\",\"sys_serial_no\":\"setSysSerialNo\",\"sys_date\":\"setSysDate\",\"sys_time\":\"setSysTime\",\"recode_list\":[{\"file_no\":\"setFileNo\",\"account_no\":\"setAccountNo\",\"account_name\":\"setAccountName\",\"opp_account_no\":\"setOppAccountNo\",\"opp_account_name\":\"setOppAccountName\",\"opp_bank_no\":\"setOppBankNo\",\"opp_bank_name\":\"setOppBankName\",\"opp_account_no_1\":\"setOppAccountNo1\",\"opp_account_name_1\":\"setOppAccountName1\",\"opp_bank_no_1\":\"setOppBankNo1\",\"opp_bank_name_1\":\"setOppBankName1\",\"note\":\"setNote\",\"check_status\":\"setCheckStatus\",\"check_remark\":\"setCheckRemark\"}]}", responseJson);
+        Assertions.assertEquals("{\"recode\":\"setRecode\",\"recode_info\":\"setRecodeInfo\",\"sys_serial_no\":\"setSysSerialNo\",\"sys_date\":\"setSysDate\",\"sys_time\":\"setSysTime\",\"recode_list\":[{\"file_no\":\"setFileNo\",\"contract_type\":\"setContractType\",\"account_no\":\"setAccountNo\",\"account_name\":\"setAccountName\",\"opp_account_no\":\"setOppAccountNo\",\"opp_account_name\":\"setOppAccountName\",\"opp_bank_no\":\"setOppBankNo\",\"opp_bank_name\":\"setOppBankName\",\"opp_account_no_1\":\"setOppAccountNo1\",\"opp_account_name_1\":\"setOppAccountName1\",\"opp_bank_no_1\":\"setOppBankNo1\",\"opp_bank_name_1\":\"setOppBankName1\",\"note\":\"setNote\",\"check_status\":\"setCheckStatus\",\"check_remark\":\"setCheckRemark\"}]}", responseJson);
 
         HttpResponse<EntPayAgrtQueryListResponse> httpResponse = MockHttpResponse.create("/entpay/agrt-query", response, EntPayAgrtQueryListResponse.class);
         Mockito.when(apiClient.post(
@@ -212,13 +212,14 @@ class EntPayServiceTest {
 
         System.out.println(Json.toJson(result));
         String resultJson = Json.toJson(result);
-        Assertions.assertEquals("{\"recode\":\"setRecode\",\"recode_info\":\"setRecodeInfo\",\"sys_serial_no\":\"setSysSerialNo\",\"sys_date\":\"setSysDate\",\"sys_time\":\"setSysTime\",\"recode_list\":[{\"file_no\":\"setFileNo\",\"account_no\":\"setAccountNo\",\"account_name\":\"setAccountName\",\"opp_account_no\":\"setOppAccountNo\",\"opp_account_name\":\"setOppAccountName\",\"opp_bank_no\":\"setOppBankNo\",\"opp_bank_name\":\"setOppBankName\",\"opp_account_no_1\":\"setOppAccountNo1\",\"opp_account_name_1\":\"setOppAccountName1\",\"opp_bank_no_1\":\"setOppBankNo1\",\"opp_bank_name_1\":\"setOppBankName1\",\"note\":\"setNote\",\"check_status\":\"setCheckStatus\",\"check_remark\":\"setCheckRemark\"}]}", resultJson);
+        Assertions.assertEquals("{\"recode\":\"setRecode\",\"recode_info\":\"setRecodeInfo\",\"sys_serial_no\":\"setSysSerialNo\",\"sys_date\":\"setSysDate\",\"sys_time\":\"setSysTime\",\"recode_list\":[{\"file_no\":\"setFileNo\",\"contract_type\":\"setContractType\",\"account_no\":\"setAccountNo\",\"account_name\":\"setAccountName\",\"opp_account_no\":\"setOppAccountNo\",\"opp_account_name\":\"setOppAccountName\",\"opp_bank_no\":\"setOppBankNo\",\"opp_bank_name\":\"setOppBankName\",\"opp_account_no_1\":\"setOppAccountNo1\",\"opp_account_name_1\":\"setOppAccountName1\",\"opp_bank_no_1\":\"setOppBankNo1\",\"opp_bank_name_1\":\"setOppBankName1\",\"note\":\"setNote\",\"check_status\":\"setCheckStatus\",\"check_remark\":\"setCheckRemark\"}]}", resultJson);
     }
 
     void extractedEntPayAgrtQueryListRequestParams(EntPayAgrtQueryListRequest request) {
         request.setSerialNo("setSerialNo");
         request.setTransDate("setTransDate");
         request.setFileNo("setFileNo");
+        request.setContractType("setContractType");
         request.setTransTradeTime("setTransTradeTime");
         request.setAccountName("setAccountName");
         request.setAccountNo("setAccountNo");
@@ -232,6 +233,7 @@ class EntPayServiceTest {
         Assertions.assertEquals("setSerialNo", request.getSerialNo());
         Assertions.assertEquals("setTransDate", request.getTransDate());
         Assertions.assertEquals("setFileNo", request.getFileNo());
+        Assertions.assertEquals("setContractType", request.getContractType());
         Assertions.assertEquals("setTransTradeTime", request.getTransTradeTime());
         Assertions.assertEquals("setAccountName", request.getAccountName());
         Assertions.assertEquals("setAccountNo", request.getAccountNo());
@@ -254,6 +256,7 @@ class EntPayServiceTest {
 
     void extractedEntPayAgrtQueryListResponseContractStPayDataNestParams(EntPayAgrtQueryListResponse.ContractStPayData nest) {
         nest.setFileNo("setFileNo");
+        nest.setContractType("setContractType");
         nest.setAccountName("setAccountName");
         nest.setOppAccountNo("setOppAccountNo");
         nest.setAccountNo("setAccountNo");
@@ -271,6 +274,7 @@ class EntPayServiceTest {
 
     void extractedEntPayAgrtQueryListResponseContractStPayDataNestAssertions(EntPayAgrtQueryListResponse.ContractStPayData nest) {
         Assertions.assertEquals("setFileNo", nest.getFileNo());
+        Assertions.assertEquals("setContractType", nest.getContractType());
         Assertions.assertEquals("setAccountName", nest.getAccountName());
         Assertions.assertEquals("setOppAccountNo", nest.getOppAccountNo());
         Assertions.assertEquals("setAccountNo", nest.getAccountNo());