diff --git a/scfs-api-service/src/main/java/com/czcb/scfs/api/service/v1/pay/model/EntPayAgrtQueryListRequest.java b/scfs-api-service/src/main/java/com/czcb/scfs/api/service/v1/pay/model/EntPayAgrtQueryListRequest.java index ac0d7ec..608e422 100644 --- a/scfs-api-service/src/main/java/com/czcb/scfs/api/service/v1/pay/model/EntPayAgrtQueryListRequest.java +++ b/scfs-api-service/src/main/java/com/czcb/scfs/api/service/v1/pay/model/EntPayAgrtQueryListRequest.java @@ -36,6 +36,11 @@ public class EntPayAgrtQueryListRequest implements ApiRequest { */ @SerializedName("file_no") private String fileNo; + /** + * 协议类型 + */ + @SerializedName("contract_type") + private String contractType; /** * 付款账户账号(经销商A1) */ diff --git a/scfs-api-service/src/main/java/com/czcb/scfs/api/service/v1/pay/model/EntPayAgrtQueryListResponse.java b/scfs-api-service/src/main/java/com/czcb/scfs/api/service/v1/pay/model/EntPayAgrtQueryListResponse.java index a67ee60..142e509 100644 --- a/scfs-api-service/src/main/java/com/czcb/scfs/api/service/v1/pay/model/EntPayAgrtQueryListResponse.java +++ b/scfs-api-service/src/main/java/com/czcb/scfs/api/service/v1/pay/model/EntPayAgrtQueryListResponse.java @@ -51,6 +51,11 @@ public class EntPayAgrtQueryListResponse implements ApiResponse { */ @SerializedName("file_no") private String fileNo; + /** + * 协议类型 + */ + @SerializedName("contract_type") + private String contractType; /** * 付款账户账号(经销商A1) */ diff --git a/scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/pay/model/EntPayAgrtQueryListRequest.java b/scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/pay/model/EntPayAgrtQueryListRequest.java index bba7be9..d9faaf1 100644 --- a/scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/pay/model/EntPayAgrtQueryListRequest.java +++ b/scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/pay/model/EntPayAgrtQueryListRequest.java @@ -36,6 +36,11 @@ public class EntPayAgrtQueryListRequest implements ApiRequest { */ @SerializedName("file_no") private String fileNo; + /** + * 协议类型 + */ + @SerializedName("contract_type") + private String contractType; /** * 付款账户账号(经销商A1) */ diff --git a/scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/pay/model/EntPayAgrtQueryListResponse.java b/scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/pay/model/EntPayAgrtQueryListResponse.java index 9ea007d..297c827 100644 --- a/scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/pay/model/EntPayAgrtQueryListResponse.java +++ b/scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/pay/model/EntPayAgrtQueryListResponse.java @@ -58,6 +58,11 @@ public class EntPayAgrtQueryListResponse implements ApiResponse { */ @SerializedName("file_no") private String fileNo; + /** + * 协议类型 + */ + @SerializedName("contract_type") + private String contractType; /** * 付款账户账号(经销商A1) */ diff --git a/scfs-api-service/src/test/java/com/czcb/scfs/api/service/v1/pay/PayServiceTest.java b/scfs-api-service/src/test/java/com/czcb/scfs/api/service/v1/pay/PayServiceTest.java index 80491ee..42dfa60 100644 --- a/scfs-api-service/src/test/java/com/czcb/scfs/api/service/v1/pay/PayServiceTest.java +++ b/scfs-api-service/src/test/java/com/czcb/scfs/api/service/v1/pay/PayServiceTest.java @@ -199,14 +199,14 @@ class PayServiceTest { extractedEntPayAgrtQueryListRequestAssertions(request); String requestJson = Json.toJson(request); - Assertions.assertEquals("{\"channel_no\":\"setChannelNo\",\"app_no\":\"setAppNo\",\"serial_no\":\"setSerialNo\",\"file_no\":\"setFileNo\",\"account_no\":\"setAccountNo\",\"account_name\":\"setAccountName\",\"start_date\":\"setStartDate\",\"end_date\":\"setEndDate\",\"trans_date\":\"setTransDate\",\"trans_tradetime\":\"setTransTradetime\"}", requestJson); + Assertions.assertEquals("{\"channel_no\":\"setChannelNo\",\"app_no\":\"setAppNo\",\"serial_no\":\"setSerialNo\",\"file_no\":\"setFileNo\",\"contract_type\":\"setContractType\",\"account_no\":\"setAccountNo\",\"account_name\":\"setAccountName\",\"start_date\":\"setStartDate\",\"end_date\":\"setEndDate\",\"trans_date\":\"setTransDate\",\"trans_tradetime\":\"setTransTradetime\"}", requestJson); EntPayAgrtQueryListResponse response = new EntPayAgrtQueryListResponse(); extractedEntPayAgrtQueryListResponseParams(response); extractedEntPayAgrtQueryListResponseAssertions(response); String responseJson = Json.toJson(response); - Assertions.assertEquals("{\"recode\":\"setRecode\",\"recode_info\":\"setRecodeInfo\",\"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\"}],\"sys_date\":\"setSysDate\",\"sys_time\":\"setSysTime\"}", responseJson); + Assertions.assertEquals("{\"recode\":\"setRecode\",\"recode_info\":\"setRecodeInfo\",\"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\"}],\"sys_date\":\"setSysDate\",\"sys_time\":\"setSysTime\"}", responseJson); HttpResponse httpResponse = MockHttpResponse.create("/entpayagrt/queryList", response, EntPayAgrtQueryListResponse.class); Mockito.when(apiClient.post( @@ -220,7 +220,7 @@ class PayServiceTest { String resultJson = Json.toJson(result); - Assertions.assertEquals("{\"recode\":\"setRecode\",\"recode_info\":\"setRecodeInfo\",\"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\"}],\"sys_date\":\"setSysDate\",\"sys_time\":\"setSysTime\"}", resultJson); + Assertions.assertEquals("{\"recode\":\"setRecode\",\"recode_info\":\"setRecodeInfo\",\"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\"}],\"sys_date\":\"setSysDate\",\"sys_time\":\"setSysTime\"}", resultJson); } void extractedEntPayAgrtQueryListRequestParams(EntPayAgrtQueryListRequest request) { @@ -233,6 +233,7 @@ class PayServiceTest { request.setStartDate("setStartDate"); request.setEndDate("setEndDate"); request.setFileNo("setFileNo"); + request.setContractType("setContractType"); request.setTransTradetime("setTransTradetime"); } @@ -246,6 +247,7 @@ class PayServiceTest { Assertions.assertEquals("setStartDate", request.getStartDate()); Assertions.assertEquals("setEndDate", request.getEndDate()); Assertions.assertEquals("setFileNo", request.getFileNo()); + Assertions.assertEquals("setContractType", request.getContractType()); Assertions.assertEquals("setTransTradetime", request.getTransTradetime()); } @@ -266,6 +268,7 @@ class PayServiceTest { nest.setAccountName("setAccountName"); nest.setAccountNo("setAccountNo"); nest.setFileNo("setFileNo"); + nest.setContractType("setContractType"); nest.setNote("setNote"); nest.setOppAccountNo("setOppAccountNo"); nest.setOppBankNo("setOppBankNo"); @@ -284,6 +287,7 @@ class PayServiceTest { Assertions.assertEquals("setAccountName", nest.getAccountName()); Assertions.assertEquals("setAccountNo", nest.getAccountNo()); Assertions.assertEquals("setFileNo", nest.getFileNo()); + Assertions.assertEquals("setContractType", nest.getContractType()); Assertions.assertEquals("setNote", nest.getNote()); Assertions.assertEquals("setOppAccountNo", nest.getOppAccountNo()); Assertions.assertEquals("setOppBankNo", nest.getOppBankNo()); diff --git a/scfs-api-service/src/test/java/com/czcb/scfs/api/service/v2/pay/PayServiceTest.java b/scfs-api-service/src/test/java/com/czcb/scfs/api/service/v2/pay/PayServiceTest.java index 9b3ed76..c05c340 100644 --- a/scfs-api-service/src/test/java/com/czcb/scfs/api/service/v2/pay/PayServiceTest.java +++ b/scfs-api-service/src/test/java/com/czcb/scfs/api/service/v2/pay/PayServiceTest.java @@ -774,14 +774,14 @@ class PayServiceTest { extractedEntPayAgrtQueryListRequestAssertions(request); String requestJson = Json.toJson(request); - Assertions.assertEquals("{\"channel_no\":\"setChannelNo\",\"app_no\":\"setAppNo\",\"serial_no\":\"setSerialNo\",\"file_no\":\"setFileNo\",\"account_no\":\"setAccountNo\",\"account_name\":\"setAccountName\",\"start_date\":\"setStartDate\",\"end_date\":\"setEndDate\",\"trans_date\":\"setTransDate\",\"trans_tradetime\":\"setTransTradeTime\"}", requestJson); + Assertions.assertEquals("{\"channel_no\":\"setChannelNo\",\"app_no\":\"setAppNo\",\"serial_no\":\"setSerialNo\",\"file_no\":\"setFileNo\",\"contract_type\":\"setContractType\",\"account_no\":\"setAccountNo\",\"account_name\":\"setAccountName\",\"start_date\":\"setStartDate\",\"end_date\":\"setEndDate\",\"trans_date\":\"setTransDate\",\"trans_tradetime\":\"setTransTradeTime\"}", requestJson); EntPayAgrtQueryListResponse response = new EntPayAgrtQueryListResponse(); extractedEntPayAgrtQueryListResponseParams(response); extractedEntPayAgrtQueryListResponseAssertions(response); String responseJson = Json.toJson(response); - Assertions.assertEquals("{\"recode\":\"setRecode\",\"recode_info\":\"setRecodeInfo\",\"sys_serial_no\":\"setSysSerialNo\",\"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\"}],\"sys_date\":\"setSysDate\",\"sys_time\":\"setSysTime\"}", responseJson); + Assertions.assertEquals("{\"recode\":\"setRecode\",\"recode_info\":\"setRecodeInfo\",\"sys_serial_no\":\"setSysSerialNo\",\"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\"}],\"sys_date\":\"setSysDate\",\"sys_time\":\"setSysTime\"}", responseJson); HttpResponse httpResponse = MockHttpResponse.create("/entpayagrt/queryList", response, EntPayAgrtQueryListResponse.class); Mockito.when(apiClient.post( @@ -794,7 +794,7 @@ class PayServiceTest { EntPayAgrtQueryListResponse result = service.entPayAgrtQueryList(request); String resultJson = Json.toJson(result); - Assertions.assertEquals("{\"recode\":\"setRecode\",\"recode_info\":\"setRecodeInfo\",\"sys_serial_no\":\"setSysSerialNo\",\"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\"}],\"sys_date\":\"setSysDate\",\"sys_time\":\"setSysTime\"}", resultJson); + Assertions.assertEquals("{\"recode\":\"setRecode\",\"recode_info\":\"setRecodeInfo\",\"sys_serial_no\":\"setSysSerialNo\",\"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\"}],\"sys_date\":\"setSysDate\",\"sys_time\":\"setSysTime\"}", resultJson); } void extractedEntPayAgrtQueryListRequestParams(EntPayAgrtQueryListRequest request) { @@ -807,6 +807,7 @@ class PayServiceTest { request.setTransDate("setTransDate"); request.setAccountName("setAccountName"); request.setFileNo("setFileNo"); + request.setContractType("setContractType"); request.setTransTradeTime("setTransTradeTime"); } @@ -820,6 +821,7 @@ class PayServiceTest { Assertions.assertEquals("setTransDate", request.getTransDate()); Assertions.assertEquals("setAccountName", request.getAccountName()); Assertions.assertEquals("setFileNo", request.getFileNo()); + Assertions.assertEquals("setContractType", request.getContractType()); Assertions.assertEquals("setTransTradeTime", request.getTransTradeTime()); } @@ -854,6 +856,7 @@ class PayServiceTest { nest.setAccountName("setAccountName"); nest.setCheckTime("setCheckTime"); nest.setFileNo("setFileNo"); + nest.setContractType("setContractType"); nest.setOppAccountNo("setOppAccountNo"); nest.setOppBankNo1("setOppBankNo1"); nest.setOppBankName1("setOppBankName1"); @@ -872,6 +875,7 @@ class PayServiceTest { Assertions.assertEquals("setAccountName", nest.getAccountName()); Assertions.assertEquals("setCheckTime", nest.getCheckTime()); Assertions.assertEquals("setFileNo", nest.getFileNo()); + Assertions.assertEquals("setContractType", nest.getContractType()); Assertions.assertEquals("setOppAccountNo", nest.getOppAccountNo()); Assertions.assertEquals("setOppBankNo1", nest.getOppBankNo1()); Assertions.assertEquals("setOppBankName1", nest.getOppBankName1());