From bbeef4536a25442426dca136f2858af09b4154d1 Mon Sep 17 00:00:00 2001
From: dzc <2388224167@qq.com>
Date: Tue, 23 Dec 2025 20:29:48 +0800
Subject: [PATCH] =?UTF-8?q?feat:=E6=94=AF=E4=BB=98=E5=AE=9D=E5=85=8D?=
 =?UTF-8?q?=E5=AF=86=E6=94=AF=E4=BB=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../pjcloud/hard/config/MiniAlipayConf.java   |  5 ++++
 .../hard/service/MiniAlipayService.java       |  6 ++++
 .../service/impl/HardAuthServiceImpl.java     |  5 ++--
 .../impl/ali/MiniAlipayServiceImpl.java       | 28 +++++++++++++++++++
 .../src/main/resources/application.yml        |  1 +
 5 files changed, 43 insertions(+), 2 deletions(-)

diff --git a/pjcloud-hardware/pjcloud-hardware-biz/src/main/java/com/bsd/pjcloud/hard/config/MiniAlipayConf.java b/pjcloud-hardware/pjcloud-hardware-biz/src/main/java/com/bsd/pjcloud/hard/config/MiniAlipayConf.java
index 09aa1ae32..15c4285d6 100644
--- a/pjcloud-hardware/pjcloud-hardware-biz/src/main/java/com/bsd/pjcloud/hard/config/MiniAlipayConf.java
+++ b/pjcloud-hardware/pjcloud-hardware-biz/src/main/java/com/bsd/pjcloud/hard/config/MiniAlipayConf.java
@@ -32,6 +32,11 @@ public class MiniAlipayConf {
      */
     private String freezeAmount;
 
+    /**
+     * 芝麻服务id
+     */
+    private String zmServiceId;
+
     /**
      * 私钥
      */
diff --git a/pjcloud-hardware/pjcloud-hardware-biz/src/main/java/com/bsd/pjcloud/hard/service/MiniAlipayService.java b/pjcloud-hardware/pjcloud-hardware-biz/src/main/java/com/bsd/pjcloud/hard/service/MiniAlipayService.java
index aca1dcea4..aab540611 100644
--- a/pjcloud-hardware/pjcloud-hardware-biz/src/main/java/com/bsd/pjcloud/hard/service/MiniAlipayService.java
+++ b/pjcloud-hardware/pjcloud-hardware-biz/src/main/java/com/bsd/pjcloud/hard/service/MiniAlipayService.java
@@ -2,6 +2,7 @@ package com.bsd.pjcloud.hard.service;
 
 
 import com.alipay.api.response.AlipayFundAuthOrderAppFreezeResponse;
+import com.alipay.api.response.ZhimaCreditPayafteruseCreditagreementSignResponse;
 
 public interface MiniAlipayService {
 
@@ -14,4 +15,9 @@ public interface MiniAlipayService {
      * 支付宝冻结金额
      */
     AlipayFundAuthOrderAppFreezeResponse freezeAmount(Long authId);
+
+    /**
+     * 支付宝签约
+     */
+    ZhimaCreditPayafteruseCreditagreementSignResponse creditagreementSign(Long authId);
 }
diff --git a/pjcloud-hardware/pjcloud-hardware-biz/src/main/java/com/bsd/pjcloud/hard/service/impl/HardAuthServiceImpl.java b/pjcloud-hardware/pjcloud-hardware-biz/src/main/java/com/bsd/pjcloud/hard/service/impl/HardAuthServiceImpl.java
index 3ab15098e..a09a63ea1 100644
--- a/pjcloud-hardware/pjcloud-hardware-biz/src/main/java/com/bsd/pjcloud/hard/service/impl/HardAuthServiceImpl.java
+++ b/pjcloud-hardware/pjcloud-hardware-biz/src/main/java/com/bsd/pjcloud/hard/service/impl/HardAuthServiceImpl.java
@@ -2,6 +2,7 @@ package com.bsd.pjcloud.hard.service.impl;
 
 import cn.hutool.core.util.ObjectUtil;
 import com.alipay.api.response.AlipayFundAuthOrderAppFreezeResponse;
+import com.alipay.api.response.ZhimaCreditPayafteruseCreditagreementSignResponse;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@@ -140,11 +141,11 @@ public class HardAuthServiceImpl extends ServiceImpl<HardAuthMapper, HardAuthEnt
 
         HardAppCreateThirdDoorOrderVo res = new HardAppCreateThirdDoorOrderVo();
 
-        AlipayFundAuthOrderAppFreezeResponse alipayRes = miniAlipayService.freezeAmount(authEntity.getId());
+        ZhimaCreditPayafteruseCreditagreementSignResponse alipayRes = miniAlipayService.creditagreementSign(authEntity.getId());
         if (ObjectUtil.isEmpty(alipayRes)) {
             throw new RuntimeException("创建支付宝免密订单失败");
         }
-        res.setAlipayOrderStr(alipayRes.getOrderStr());
+        res.setAlipayOrderStr(alipayRes.getBody());
         return res;
     }
 
diff --git a/pjcloud-hardware/pjcloud-hardware-biz/src/main/java/com/bsd/pjcloud/hard/service/impl/ali/MiniAlipayServiceImpl.java b/pjcloud-hardware/pjcloud-hardware-biz/src/main/java/com/bsd/pjcloud/hard/service/impl/ali/MiniAlipayServiceImpl.java
index 630010e3b..dee978762 100644
--- a/pjcloud-hardware/pjcloud-hardware-biz/src/main/java/com/bsd/pjcloud/hard/service/impl/ali/MiniAlipayServiceImpl.java
+++ b/pjcloud-hardware/pjcloud-hardware-biz/src/main/java/com/bsd/pjcloud/hard/service/impl/ali/MiniAlipayServiceImpl.java
@@ -6,10 +6,13 @@ import com.alipay.api.AlipayConfig;
 import com.alipay.api.DefaultAlipayClient;
 import com.alipay.api.domain.AlipayFundAuthOrderAppFreezeModel;
 import com.alipay.api.domain.AlipayOpenAppQrcodeCreateModel;
+import com.alipay.api.domain.ZhimaCreditPayafteruseCreditagreementSignModel;
 import com.alipay.api.request.AlipayFundAuthOrderAppFreezeRequest;
 import com.alipay.api.request.AlipayOpenAppQrcodeCreateRequest;
+import com.alipay.api.request.ZhimaCreditPayafteruseCreditagreementSignRequest;
 import com.alipay.api.response.AlipayFundAuthOrderAppFreezeResponse;
 import com.alipay.api.response.AlipayOpenAppQrcodeCreateResponse;
+import com.alipay.api.response.ZhimaCreditPayafteruseCreditagreementSignResponse;
 import com.bsd.pjcloud.hard.config.MiniAlipayConf;
 import com.bsd.pjcloud.hard.service.MiniAlipayService;
 import lombok.AllArgsConstructor;
@@ -113,4 +116,29 @@ public class MiniAlipayServiceImpl implements MiniAlipayService {
         }
     }
 
+    /**
+     * 支付宝签约
+     */
+    public ZhimaCreditPayafteruseCreditagreementSignResponse creditagreementSign(Long authId) {
+        ZhimaCreditPayafteruseCreditagreementSignRequest request = new ZhimaCreditPayafteruseCreditagreementSignRequest();
+        ZhimaCreditPayafteruseCreditagreementSignModel model = new ZhimaCreditPayafteruseCreditagreementSignModel();
+        // 设置芝麻信用服务ID
+        model.setZmServiceId(conf.getZmServiceId());
+        model.setOutAgreementNo(String.valueOf(authId));
+        request.setBizModel(model);
+        try {
+            ZhimaCreditPayafteruseCreditagreementSignResponse response = getClient().sdkExecute(request);
+            if (!response.isSuccess()) {
+                log.error("|支付宝签约|失败,json|{}", response.getBody());
+                return null;
+            }
+            log.info("|支付宝签约|成功,json|{}", response.getBody());
+            return response;
+        } catch (Exception e) {
+            e.printStackTrace();
+            log.error("|支付宝签约|意外的错误", e);
+            return null;
+        }
+    }
+
 }
diff --git a/pjcloud-hardware/pjcloud-hardware-biz/src/main/resources/application.yml b/pjcloud-hardware/pjcloud-hardware-biz/src/main/resources/application.yml
index 0bd55b6b2..dfd0a4f96 100644
--- a/pjcloud-hardware/pjcloud-hardware-biz/src/main/resources/application.yml
+++ b/pjcloud-hardware/pjcloud-hardware-biz/src/main/resources/application.yml
@@ -46,6 +46,7 @@ mini-ali-pay:
   merchant-id: 2088570073831141
   merchant-account: 1472871899@qq.com
   freeze-amount: 100
+  zm-service-id: 2025122300000000000107601400
   private-key: MIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQCTYHY0AW2cjbHoOinD8f4CKMKasDmbRw4CEMasG5IzckmeuTqut3GmxxRRls62zlXRVOCDYgnGhzEhD/nMYx0TMBX2mYo+fH9XUMtZMKY+p2rPTXTlPnGfbQ4edUYofR0tq1ug+wHOD5/jxuwO1zPfB7t8dX3gNa4M43fTPK2mPDeo/UiRB45DPjUWvbMX59ltYYMgmAW0TAbXmRAGKFxrmX3HddJK0jSwEpTcHaRV3C6FrYV48vWHEliviVBUsLRIpwv3T3FYZm0a19LcGQtybeThXaaCYrj7Lwoffk8v8DL2g28IAeiFtjjkWbPFKKMCsSe/LVkvdQTuhncuDayTAgMBAAECggEAJvreiMbP7RZ1Nc0cet0op/2L60otEmrqw5UYVzE7rCvQWRD4+nk+sDP7pdDTf/p3LFTcxSNLHp1nWy1UjsCwUgDn7j+SFxDqxXdzMXXyoqO5VndQMcogV2CK2Xd/RPpCm2+1XpDFW3E6gw58JTi6WYU8C6Ev1/uau4H2kYJ9E3h2W0P0PyY+Q9QNHEpG2hLQdiWLHz3xzmSNSDXiknEg/Whew7IMVKNgxg5VVEBTerwCH5Grvn56CKx6acb6JlU+VFsmW3J1tMYLgxVhJWVVAK6NltmxE5apIxTkG3wEOMuuBCZHQ1Lm0rrGKJh8WmYRs6ho5wSjHYG3hyKRm/0TEQKBgQDcDDPyOWw/o9ZqB3N7qxUi63V7wU7X8QL/CmQO4tu/ng/4Drm8QESjk+ib3O3pCC7xwcte/U1Otw3AmSSj1CWvT8a0yLJM9GVOJwZFVyzy6yVFPyn6l4ndRdargyFokM2lgVTgEHo4WSMbLQsA8/KTB3anqo6bYLjqjsBgY49fpQKBgQCrdLMh5ayJOUK9UeBHXr0c/OLDzwoSUVMyNLfX3pIBC21meFxigNMiy+UKpslM2QMH1yyfwsUKv/i7y1kRFj9Go7pYU0HxglfHecllqXPunWJYuSm38x8WWAG/oqcLPGSlJjHYhU6IAkDuHHaW5DKLxr0x2DkZ/c4TcyYal9Ol1wKBgD4Lls4S0On02W1WIoLZT4FkIOE/NWsAAxdEp8fmwY17FQedp1NkT7ZL60efeNm/O/Vg7mYfSCAMz2ziAYnMNMAE34N0H4pBUxtBN6xvkzX/hafL0ptdBTuGCKydsdrZEZM8L2FqY/vlbleoULT5FAnPDe7i0YkQMbO5gpbrG68dAoGAFv+tc7OSREn5CNotwoUTywqlBG0GRdTA2zA1JPDHFvrIbwFgKxpqt/UvwREEWZmWjXuwkbGXqsx7ef1Z8i/QxxH5UhXA97trOOe+OzPSyEQ2R/52eSVUmzOs8F7KF3i/a2PHNesT0Ky0tvv8cFsl6Jf9Eu2VI0ZnWTaN+u04x7sCgYEAlhpr3RSJk2EnLPR3BxKboTxSGsK/2U4xz/WqX96B+lQ5h7NSMJC35vZJ5dm2vHtLcucHaK49YNsJdq+nzhhwxDz+Dd/5rcIp7AcdHqDsVLHYIN7JWxa9QiC3gvrnWsij1DShydOLpGMYveFz0LyRIUDW4CTs55oDFsIR4HdwtM0=
   public-key: MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAk2B2NAFtnI2x6Dopw/H+AijCmrA5m0cOAhDGrBuSM3JJnrk6rrdxpscUUZbOts5V0VTgg2IJxocxIQ/5zGMdEzAV9pmKPnx/V1DLWTCmPqdqz0105T5xn20OHnVGKH0dLatboPsBzg+f48bsDtcz3we7fHV94DWuDON30zytpjw3qP1IkQeOQz41Fr2zF+fZbWGDIJgFtEwG15kQBihca5l9x3XSStI0sBKU3B2kVdwuha2FePL1hxJYr4lQVLC0SKcL909xWGZtGtfS3BkLcm3k4V2mgmK4+y8KH35PL/Ay9oNvCAHohbY45FmzxSijArEnvy1ZL3UE7oZ3Lg2skwIDAQAB
   alipay-public-key: MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAqnCB+N172m5gxf1Rolfx5LErSiVwQCh0XQdDrVy6aTuVF5EtdqahSHtADyEPsBWudMBhzCfqpoZvfnvH7a+PED6uZ3DoXt7ETh8TmNM5yc+WTnD8pSphQvuHDJ3zMks489KNxiX6sXag71k9H1MXklJGPOUaljHqy/QlRn2ZLT7pFgaFH9LEcVoQBPIOurUn95078h848RFD30jZFW3fakxUGAGVVZaHH62z5OEWOmcA+CwxsEDMa1XMt02RGXgAAq4WOj+BqOGiFmhM8rnrUMchTyvx4umOzGvbF2Y9irN3aBZ5lfg+bzYcJpIOMzlM/V00LnEWzCblJzXNyH4hJQIDAQAB