From 01f88f12c91e3bc1fc9302c76a77e5de784e9668 Mon Sep 17 00:00:00 2001 From: 13009 Date: Tue, 27 Aug 2024 14:47:07 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20PayService=E5=8D=95=E5=85=83=E6=B5=8B?= =?UTF-8?q?=E8=AF=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../czcb/scfs/api/service/v2/pay/PayServiceTest.java | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) 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 c36c365..9b3ed76 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 @@ -898,7 +898,7 @@ class PayServiceTest { 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\",\"data\":[{\"account_class\":\"setAccountClass\",\"seq_no\":\"setSeqNo\",\"account_no\":\"setAccountNo\",\"account_name\":\"setAccountName\",\"core_account_no\":\"setCoreAccountNo\",\"trans_amount\":100.0,\"pay_path\":\"setPayPath\",\"opp_account_no\":\"setOppAccountNo\",\"opp_account_name\":\"setOppAccountName\",\"status\":\"setStatus\",\"failure_msg\":\"setFailureMsg\",\"failure_flag\":\"setFailureFlag\",\"redo_flag\":\"setRedoFlag\"}]}", responseJson); + Assertions.assertEquals("{\"recode\":\"setRecode\",\"recode_info\":\"setRecodeInfo\",\"sys_serial_no\":\"setSysSerialNo\",\"sys_date\":\"setSysDate\",\"sys_time\":\"setSysTime\",\"data\":[{\"account_class\":\"setAccountClass\",\"seq_no\":\"setSeqNo\",\"account_no\":\"setAccountNo\",\"account_name\":\"setAccountName\",\"trans_amount\":100.0,\"pay_path\":\"setPayPath\",\"opp_account_no\":\"setOppAccountNo\",\"opp_account_name\":\"setOppAccountName\",\"status\":\"setStatus\",\"failure_msg\":\"setFailureMsg\",\"failure_flag\":\"setFailureFlag\",\"redo_flag\":\"setRedoFlag\"}]}", responseJson); HttpResponse httpResponse = MockHttpResponse.create("/offline-recharge/details/query", response, OfflineRechargeDetailQueryResponse.class); Mockito.when(apiClient.post( @@ -912,7 +912,7 @@ class PayServiceTest { 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\",\"data\":[{\"account_class\":\"setAccountClass\",\"seq_no\":\"setSeqNo\",\"account_no\":\"setAccountNo\",\"account_name\":\"setAccountName\",\"core_account_no\":\"setCoreAccountNo\",\"trans_amount\":100.0,\"pay_path\":\"setPayPath\",\"opp_account_no\":\"setOppAccountNo\",\"opp_account_name\":\"setOppAccountName\",\"status\":\"setStatus\",\"failure_msg\":\"setFailureMsg\",\"failure_flag\":\"setFailureFlag\",\"redo_flag\":\"setRedoFlag\"}]}", resultJson); + Assertions.assertEquals("{\"recode\":\"setRecode\",\"recode_info\":\"setRecodeInfo\",\"sys_serial_no\":\"setSysSerialNo\",\"sys_date\":\"setSysDate\",\"sys_time\":\"setSysTime\",\"data\":[{\"account_class\":\"setAccountClass\",\"seq_no\":\"setSeqNo\",\"account_no\":\"setAccountNo\",\"account_name\":\"setAccountName\",\"trans_amount\":100.0,\"pay_path\":\"setPayPath\",\"opp_account_no\":\"setOppAccountNo\",\"opp_account_name\":\"setOppAccountName\",\"status\":\"setStatus\",\"failure_msg\":\"setFailureMsg\",\"failure_flag\":\"setFailureFlag\",\"redo_flag\":\"setRedoFlag\"}]}", resultJson); } void extractedOfflineRechargeDetailQueryRequestParams(OfflineRechargeDetailQueryRequest request) { @@ -953,7 +953,6 @@ class PayServiceTest { void extractedOfflineRechargeDetailQueryResponseOfflineRechargeDetailDTONestParams(OfflineRechargeDetailQueryResponse.OfflineRechargeDetailDTO nest) { nest.setOppAccountNo("setOppAccountNo"); nest.setAccountNo("setAccountNo"); - nest.setCoreAccountNo("setCoreAccountNo"); nest.setRedoFlag("setRedoFlag"); nest.setSeqNo("setSeqNo"); nest.setFailureFlag("setFailureFlag"); @@ -969,7 +968,6 @@ class PayServiceTest { void extractedOfflineRechargeDetailQueryResponseOfflineRechargeDetailDTONestAssertions(OfflineRechargeDetailQueryResponse.OfflineRechargeDetailDTO nest) { Assertions.assertEquals("setOppAccountNo", nest.getOppAccountNo()); Assertions.assertEquals("setAccountNo", nest.getAccountNo()); - Assertions.assertEquals("setCoreAccountNo", nest.getCoreAccountNo()); Assertions.assertEquals("setRedoFlag", nest.getRedoFlag()); Assertions.assertEquals("setSeqNo", nest.getSeqNo()); Assertions.assertEquals("setFailureFlag", nest.getFailureFlag()); @@ -1009,7 +1007,7 @@ class PayServiceTest { 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\",\"data\":[{\"match_status\":\"setMatchStatus\",\"match_amount\":100.0,\"account_class\":\"setAccountClass\",\"seq_no\":\"setSeqNo\",\"account_no\":\"setAccountNo\",\"account_name\":\"setAccountName\",\"core_account_no\":\"setCoreAccountNo\",\"trans_amount\":100.0,\"pay_path\":\"setPayPath\",\"opp_account_no\":\"setOppAccountNo\",\"opp_account_name\":\"setOppAccountName\",\"trade_time\":\"setTradeTime\",\"status\":\"setStatus\",\"failure_msg\":\"setFailureMsg\",\"failure_flag\":\"setFailureFlag\",\"redo_flag\":\"setRedoFlag\"}]}", responseJson); + Assertions.assertEquals("{\"recode\":\"setRecode\",\"recode_info\":\"setRecodeInfo\",\"sys_serial_no\":\"setSysSerialNo\",\"sys_date\":\"setSysDate\",\"sys_time\":\"setSysTime\",\"data\":[{\"match_status\":\"setMatchStatus\",\"match_amount\":100.0,\"account_class\":\"setAccountClass\",\"seq_no\":\"setSeqNo\",\"account_no\":\"setAccountNo\",\"account_name\":\"setAccountName\",\"trans_amount\":100.0,\"pay_path\":\"setPayPath\",\"opp_account_no\":\"setOppAccountNo\",\"opp_account_name\":\"setOppAccountName\",\"trade_time\":\"setTradeTime\",\"status\":\"setStatus\",\"failure_msg\":\"setFailureMsg\",\"failure_flag\":\"setFailureFlag\",\"redo_flag\":\"setRedoFlag\"}]}", responseJson); HttpResponse httpResponse = MockHttpResponse.create("/offline-recharge/details/unmatched/query", response, OfflineRechargeDetailUnmatchedQueryResponse.class); Mockito.when(apiClient.post( @@ -1023,7 +1021,7 @@ class PayServiceTest { 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\",\"data\":[{\"match_status\":\"setMatchStatus\",\"match_amount\":100.0,\"account_class\":\"setAccountClass\",\"seq_no\":\"setSeqNo\",\"account_no\":\"setAccountNo\",\"account_name\":\"setAccountName\",\"core_account_no\":\"setCoreAccountNo\",\"trans_amount\":100.0,\"pay_path\":\"setPayPath\",\"opp_account_no\":\"setOppAccountNo\",\"opp_account_name\":\"setOppAccountName\",\"trade_time\":\"setTradeTime\",\"status\":\"setStatus\",\"failure_msg\":\"setFailureMsg\",\"failure_flag\":\"setFailureFlag\",\"redo_flag\":\"setRedoFlag\"}]}", resultJson); + Assertions.assertEquals("{\"recode\":\"setRecode\",\"recode_info\":\"setRecodeInfo\",\"sys_serial_no\":\"setSysSerialNo\",\"sys_date\":\"setSysDate\",\"sys_time\":\"setSysTime\",\"data\":[{\"match_status\":\"setMatchStatus\",\"match_amount\":100.0,\"account_class\":\"setAccountClass\",\"seq_no\":\"setSeqNo\",\"account_no\":\"setAccountNo\",\"account_name\":\"setAccountName\",\"trans_amount\":100.0,\"pay_path\":\"setPayPath\",\"opp_account_no\":\"setOppAccountNo\",\"opp_account_name\":\"setOppAccountName\",\"trade_time\":\"setTradeTime\",\"status\":\"setStatus\",\"failure_msg\":\"setFailureMsg\",\"failure_flag\":\"setFailureFlag\",\"redo_flag\":\"setRedoFlag\"}]}", resultJson); } void extractedOfflineRechargeDetailUnmatchedQueryRequestParams(OfflineRechargeDetailUnmatchedQueryRequest request) { @@ -1065,7 +1063,6 @@ class PayServiceTest { nest.setOppAccountNo("setOppAccountNo"); nest.setAccountNo("setAccountNo"); nest.setMatchAmount(BigDecimal.valueOf(100.00)); - nest.setCoreAccountNo("setCoreAccountNo"); nest.setRedoFlag("setRedoFlag"); nest.setSeqNo("setSeqNo"); nest.setTradeTime("setTradeTime"); @@ -1084,7 +1081,6 @@ class PayServiceTest { Assertions.assertEquals("setOppAccountNo", nest.getOppAccountNo()); Assertions.assertEquals("setAccountNo", nest.getAccountNo()); Assertions.assertEquals(BigDecimal.valueOf(100.00), nest.getMatchAmount()); - Assertions.assertEquals("setCoreAccountNo", nest.getCoreAccountNo()); Assertions.assertEquals("setRedoFlag", nest.getRedoFlag()); Assertions.assertEquals("setSeqNo", nest.getSeqNo()); Assertions.assertEquals("setFailureFlag", nest.getFailureFlag());