From 2bd2e0b9c2220cc9de02d000df53212ccd82a002 Mon Sep 17 00:00:00 2001 From: wb2476 Date: Fri, 15 Nov 2024 15:37:31 +0800 Subject: [PATCH] =?UTF-8?q?feat=EF=BC=9Apay=E5=8F=8A=E8=82=A5=E7=8C=AB?= =?UTF-8?q?=E5=8F=97=E6=89=98=E6=94=AF=E4=BB=98=E5=8D=8F=E8=AE=AE=E5=88=97?= =?UTF-8?q?=E8=A1=A8V2=E6=8E=A5=E5=8F=A3=E6=B7=BB=E5=8A=A0=E5=AD=97?= =?UTF-8?q?=E6=AE=B5=EF=BC=88=E5=8D=8F=E8=AE=AE=E7=B1=BB=E5=9E=8B=EF=BC=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../v2/cat/project/model/EntpayAgrtQueryRequest.java | 6 ++++++ .../v2/cat/project/model/EntpayAgrtQueryResponse.java | 6 ++++++ .../v2/entpay/model/EntPayAgrtQueryListRequest.java | 6 ++++++ .../v2/entpay/model/EntPayAgrtQueryListResponse.java | 6 ++++++ .../api/service/v2/cat/project/ProjectServiceTest.java | 10 +++++++--- .../scfs/api/service/v2/entpay/EntPayServiceTest.java | 10 +++++++--- 6 files changed, 38 insertions(+), 6 deletions(-) diff --git a/scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/cat/project/model/EntpayAgrtQueryRequest.java b/scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/cat/project/model/EntpayAgrtQueryRequest.java index 0d87e9b..c53cff8 100644 --- a/scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/cat/project/model/EntpayAgrtQueryRequest.java +++ b/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; + /** * 付款账户账号 */ diff --git a/scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/cat/project/model/EntpayAgrtQueryResponse.java b/scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/cat/project/model/EntpayAgrtQueryResponse.java index 32575b7..b535b2f 100644 --- a/scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/cat/project/model/EntpayAgrtQueryResponse.java +++ b/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; + /** * 付款账户账号 */ diff --git a/scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/entpay/model/EntPayAgrtQueryListRequest.java b/scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/entpay/model/EntPayAgrtQueryListRequest.java index c3797bb..26748aa 100644 --- a/scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/entpay/model/EntPayAgrtQueryListRequest.java +++ b/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） */ diff --git a/scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/entpay/model/EntPayAgrtQueryListResponse.java b/scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/entpay/model/EntPayAgrtQueryListResponse.java index 73e1891..4a089d0 100644 --- a/scfs-api-service/src/main/java/com/czcb/scfs/api/service/v2/entpay/model/EntPayAgrtQueryListResponse.java +++ b/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; + /** * 付款账户账号 */ diff --git a/scfs-api-service/src/test/java/com/czcb/scfs/api/service/v2/cat/project/ProjectServiceTest.java b/scfs-api-service/src/test/java/com/czcb/scfs/api/service/v2/cat/project/ProjectServiceTest.java index 6c6acaa..6a514f0 100644 --- a/scfs-api-service/src/test/java/com/czcb/scfs/api/service/v2/cat/project/ProjectServiceTest.java +++ b/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 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()); diff --git a/scfs-api-service/src/test/java/com/czcb/scfs/api/service/v2/entpay/EntPayServiceTest.java b/scfs-api-service/src/test/java/com/czcb/scfs/api/service/v2/entpay/EntPayServiceTest.java index e43fc0c..ef2dc49 100644 --- a/scfs-api-service/src/test/java/com/czcb/scfs/api/service/v2/entpay/EntPayServiceTest.java +++ b/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 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());