From db3c6351971f1169136ea75e653e59e274a87bb7 Mon Sep 17 00:00:00 2001 From: gong <1157756119@qq.com> Date: Fri, 9 Jan 2026 10:51:31 +0800 Subject: [PATCH] =?UTF-8?q?=E5=BD=93=E9=9D=A2=E4=BB=98=E8=BF=9B=E4=BB=B6?= =?UTF-8?q?=E4=BF=AE=E6=94=B91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/czg/EntryManager.java | 1 + .../main/java/com/czg/dto/resp/EntryRespDto.java | 5 +++++ .../java/com/czg/dto/resp/EntryThirdRespDto.java | 5 +++++ .../com/czg/third/alipay/AlipayIsvEntryManager.java | 13 +++++++------ 4 files changed, 18 insertions(+), 6 deletions(-) diff --git a/cash-sdk/aggregation-pay/src/main/java/com/czg/EntryManager.java b/cash-sdk/aggregation-pay/src/main/java/com/czg/EntryManager.java index e27ba048d..b93cae9f7 100644 --- a/cash-sdk/aggregation-pay/src/main/java/com/czg/EntryManager.java +++ b/cash-sdk/aggregation-pay/src/main/java/com/czg/EntryManager.java @@ -101,6 +101,7 @@ public class EntryManager { entryRespDto.setAlipayOrderId(respDto.getEntryId()); entryRespDto.setAlipayStatus(respDto.getStatus()); entryRespDto.setAlipayErrorMsg(respDto.getErrorMsg()); + entryRespDto.setAlipayAuthInfo(respDto.getAlipayAuthInfo()); } } return entryRespDto; diff --git a/cash-sdk/aggregation-pay/src/main/java/com/czg/dto/resp/EntryRespDto.java b/cash-sdk/aggregation-pay/src/main/java/com/czg/dto/resp/EntryRespDto.java index f6abe75e4..ade747ce3 100644 --- a/cash-sdk/aggregation-pay/src/main/java/com/czg/dto/resp/EntryRespDto.java +++ b/cash-sdk/aggregation-pay/src/main/java/com/czg/dto/resp/EntryRespDto.java @@ -33,6 +33,11 @@ public class EntryRespDto { */ private String alipayOrderId; + /** + * 支付宝授信息 + */ + private String alipayAuthInfo; + /** * 支付宝状态 * {@link com.czg.PayCst.EntryStatus} diff --git a/cash-sdk/aggregation-pay/src/main/java/com/czg/dto/resp/EntryThirdRespDto.java b/cash-sdk/aggregation-pay/src/main/java/com/czg/dto/resp/EntryThirdRespDto.java index 449b56f46..63b3cde9a 100644 --- a/cash-sdk/aggregation-pay/src/main/java/com/czg/dto/resp/EntryThirdRespDto.java +++ b/cash-sdk/aggregation-pay/src/main/java/com/czg/dto/resp/EntryThirdRespDto.java @@ -16,6 +16,11 @@ public class EntryThirdRespDto { */ private String entryId; + /** + * 支付宝授信息 + */ + private String alipayAuthInfo; + /** * 平台 */ diff --git a/cash-sdk/aggregation-pay/src/main/java/com/czg/third/alipay/AlipayIsvEntryManager.java b/cash-sdk/aggregation-pay/src/main/java/com/czg/third/alipay/AlipayIsvEntryManager.java index f2aefb600..e3ae2146d 100644 --- a/cash-sdk/aggregation-pay/src/main/java/com/czg/third/alipay/AlipayIsvEntryManager.java +++ b/cash-sdk/aggregation-pay/src/main/java/com/czg/third/alipay/AlipayIsvEntryManager.java @@ -103,6 +103,7 @@ public class AlipayIsvEntryManager { .setPlatform(PayCst.Platform.ALIPAY); try { String batchNo = createRequest(reqDto); + respDto.setEntryId(batchNo); AlipayOpenAgentFacetofaceSignModel signModel = buildFaceToFaceModel(reqDto, batchNo); File businessLicensePic = UploadFileUtil.getFileByUrl(reqDto.getBusinessLicenceInfo().getLicensePic().getUrl()); @@ -115,8 +116,8 @@ public class AlipayIsvEntryManager { log.info("支付宝开启代商户签约: 响应={}", JSONObject.toJSONString(response)); try { - String orderNo = confirmRequest(batchNo); - respDto.setEntryId(orderNo); + String authInfo = confirmRequest(batchNo); + respDto.setAlipayAuthInfo(authInfo); respDto.setStatus(PayCst.EntryStatus.INIT); respDto.setErrorMsg(""); return respDto; @@ -180,15 +181,15 @@ public class AlipayIsvEntryManager { public static String confirmRequest(String batchNo) { AlipayClient.setApiClient(null); // 构造请求参数以调用接口 - AlipayOpenAgentCommonsignApi api = new AlipayOpenAgentCommonsignApi(); - AlipayOpenAgentCommonsignConfirmModel data = new AlipayOpenAgentCommonsignConfirmModel(); + AlipayOpenAgentApi api = new AlipayOpenAgentApi(); + AlipayOpenAgentConfirmModel data = new AlipayOpenAgentConfirmModel(); // 设置ISV 代商户操作事务编号 data.setBatchNo(batchNo); try { - AlipayOpenAgentCommonsignConfirmResponseModel response = api.confirm(data); + AlipayOpenAgentConfirmResponseModel response = api.confirm(data); log.info("支付宝开启代商户签约，确认事务: 响应={}", response); - return response.getOrderNo(); + return JSONObject.toJSONString(response); } catch (ApiException e) { String body = e.getResponseBody(); log.error("支付宝开启代商户签约，确认事务异常: {}", body);