From fa4469b49475e10c02b00ce2a84c0d27520d0c9a Mon Sep 17 00:00:00 2001
From: gong <1157756119@qq.com>
Date: Thu, 8 Jan 2026 18:18:27 +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=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/java/com/czg/EntryManager.java    |  4 ++--
 .../third/alipay/AlipayIsvEntryManager.java    | 18 ++++++++----------
 2 files changed, 10 insertions(+), 12 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 fcfd1224e..e27ba048d 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
@@ -41,7 +41,7 @@ public class EntryManager {
     /**
      * 查询微信进件状态
      *
-     * @param merchantCode 商户编号, 进件时返回的批次号 {@link com.czg.dto.resp.EntryRespDto#wechatApplyId}
+     * @param merchantCode 商户编号, 进件时返回的批次号 {@link EntryRespDto#wechatApplyId}
      * @return 进件状态
      */
     public static QueryStatusResp queryWechatEntryStatus(String merchantCode) {
@@ -51,7 +51,7 @@ public class EntryManager {
     /**
      * 查询支付宝进件状态
      *
-     * @param batchNo 商户编号, 进件时返回的批次号 {@link com.czg.dto.resp.EntryRespDto#alipayOrderId}
+     * @param batchNo 商户编号, 进件时返回的批次号 {@link EntryRespDto#alipayOrderId}
      * @return 进件状态
      */
     public static QueryStatusResp queryAlipayEntryStatus(String batchNo) {
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 5efcd1965..f2aefb600 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
@@ -2,10 +2,7 @@ package com.czg.third.alipay;
 
 import com.alibaba.fastjson2.JSONObject;
 import com.alipay.v3.ApiException;
-import com.alipay.v3.api.AlipayOpenAgentApi;
-import com.alipay.v3.api.AlipayOpenAgentCommonsignApi;
-import com.alipay.v3.api.AlipayOpenAgentFacetofaceApi;
-import com.alipay.v3.api.AlipayOpenAgentOrderApi;
+import com.alipay.v3.api.*;
 import com.alipay.v3.model.*;
 import com.czg.PayCst;
 import com.czg.dto.req.*;
@@ -107,15 +104,13 @@ public class AlipayIsvEntryManager {
         try {
             String batchNo = createRequest(reqDto);
 
-            // 构造请求参数以调用接口
-            AlipayOpenAgentFacetofaceApi api = new AlipayOpenAgentFacetofaceApi();
-
-            AlipayOpenAgentFacetofaceSignModel signModel = buildSignModel(reqDto, batchNo);
-
+            AlipayOpenAgentFacetofaceSignModel signModel = buildFaceToFaceModel(reqDto, batchNo);
             File businessLicensePic = UploadFileUtil.getFileByUrl(reqDto.getBusinessLicenceInfo().getLicensePic().getUrl());
             File shopScenePic = UploadFileUtil.getFileByUrl(reqDto.getStoreInfo().getInsidePic().getUrl());
             File shopSignBoardPic = UploadFileUtil.getFileByUrl(reqDto.getStoreInfo().getDoorPic().getUrl());
 
+            // 构造请求参数以调用接口
+            AlipayOpenAgentFacetofaceApi api = new AlipayOpenAgentFacetofaceApi();
             Object response = api.sign(null, businessLicensePic, signModel, shopScenePic, shopSignBoardPic, null);
             log.info("支付宝开启代商户签约: 响应={}", JSONObject.toJSONString(response));
 
@@ -202,7 +197,10 @@ public class AlipayIsvEntryManager {
         }
     }
 
-    public static AlipayOpenAgentFacetofaceSignModel buildSignModel(AggregateMerchantDto reqDto, String batchNo) {
+    /**
+     * 构建 当面付参数
+     */
+    public static AlipayOpenAgentFacetofaceSignModel buildFaceToFaceModel(AggregateMerchantDto reqDto, String batchNo) {
         AlipayOpenAgentFacetofaceSignModel signModel = new AlipayOpenAgentFacetofaceSignModel();
         signModel.setBatchNo(batchNo);