当面付进件修改1

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;

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}

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;
+
     /**
      * 平台
      */

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);
+                String authInfo = confirmRequest(batchNo);
-                respDto.setEntryId(orderNo);
+                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();
+        AlipayOpenAgentApi api = new AlipayOpenAgentApi();
-        AlipayOpenAgentCommonsignConfirmModel data = new AlipayOpenAgentCommonsignConfirmModel();
+        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);