From d9808f2ca55bc5606cd2cf5c6037ea442380c998 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9B=B9=E7=A3=8A?= <45566618@qq.com>
Date: Fri, 23 May 2025 10:28:57 +0800
Subject: [PATCH] =?UTF-8?q?=E5=BE=AE=E4=BF=A1=E6=94=AF=E4=BB=98v3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/WechatPay2Controller.java      | 31 ++++++++++++++-----
 .../src/main/resources/application-dev.yml    |  2 +-
 .../main/resources/cert}/apiclient_key.pem    |  0
 pom.xml                                       | 24 +++++++-------
 4 files changed, 37 insertions(+), 20 deletions(-)
 rename nursing-unit-system/nu-system-start/{ => src/main/resources/cert}/apiclient_key.pem (100%)

diff --git a/nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/wechart/controller/WechatPay2Controller.java b/nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/wechart/controller/WechatPay2Controller.java
index 083f2d4..8097c6d 100644
--- a/nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/wechart/controller/WechatPay2Controller.java
+++ b/nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/wechart/controller/WechatPay2Controller.java
@@ -6,13 +6,13 @@ import com.wechat.pay.java.core.Config;
 import com.wechat.pay.java.core.RSAAutoCertificateConfig;
 
 import com.wechat.pay.java.service.payments.jsapi.JsapiService;
-import com.wechat.pay.java.service.payments.jsapi.model.Amount;
-import com.wechat.pay.java.service.payments.jsapi.model.Payer;
-import com.wechat.pay.java.service.payments.jsapi.model.PrepayRequest;
-import com.wechat.pay.java.service.payments.jsapi.model.PrepayResponse;
+import com.wechat.pay.java.service.payments.jsapi.JsapiServiceExtension;
+import com.wechat.pay.java.service.payments.jsapi.model.*;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
+
+import java.util.HashMap;
 import java.util.Map;
 
 @RestController
@@ -126,8 +126,25 @@ public class WechatPay2Controller {
         request.setPayer(payer);
         // 调用下单方法，得到应答
         PrepayResponse response = service.prepay(request);
-        String prepayId = response.getPrepayId();
-        log.info("prepayId：" + prepayId);
-        return null;
+        log.info("prepayId：" + response.getPrepayId());
+        Map map = prepayWithRequestPayment(request);
+        return map;
+    }
+
+    /**
+     * 返回调起支付的参数
+     * @return
+     */
+    private Map<String,String> prepayWithRequestPayment(PrepayRequest request){
+        Map<String,String> map = new HashMap<>();
+        JsapiServiceExtension jse = new JsapiServiceExtension.Builder().build();
+        PrepayWithRequestPaymentResponse response = jse.prepayWithRequestPayment(request);
+        map.put("appId",response.getAppId());
+        map.put("timeStamp",response.getTimeStamp());
+        map.put("nonceStr",response.getNonceStr());
+        map.put("package",response.getPackageVal());
+        map.put("signType",response.getSignType());
+        map.put("paySign",response.getPaySign());
+        return map;
     }
 }
diff --git a/nursing-unit-system/nu-system-start/src/main/resources/application-dev.yml b/nursing-unit-system/nu-system-start/src/main/resources/application-dev.yml
index ef650d9..4e27e04 100644
--- a/nursing-unit-system/nu-system-start/src/main/resources/application-dev.yml
+++ b/nursing-unit-system/nu-system-start/src/main/resources/application-dev.yml
@@ -387,4 +387,4 @@ wxpay:
   # 接收结果通知地址
   notify-domain: http://r2agtr.natappfree.cc
   # 商户私钥文件路径
-  private-key-path: apiclient_key.pem
\ No newline at end of file
+  private-key-path: c://apiclient_key.pem
\ No newline at end of file
diff --git a/nursing-unit-system/nu-system-start/apiclient_key.pem b/nursing-unit-system/nu-system-start/src/main/resources/cert/apiclient_key.pem
similarity index 100%
rename from nursing-unit-system/nu-system-start/apiclient_key.pem
rename to nursing-unit-system/nu-system-start/src/main/resources/cert/apiclient_key.pem
diff --git a/pom.xml b/pom.xml
index ed7f346..6472460 100644
--- a/pom.xml
+++ b/pom.xml
@@ -153,18 +153,18 @@
             <version>${commonmark.version}</version>
         </dependency>
         <!-- Nacos 服务发现 -->
-<!--        <dependency>-->
-<!--            <groupId>com.alibaba.cloud</groupId>-->
-<!--            <artifactId>spring-cloud-starter-alibaba-nacos-discovery</artifactId>-->
-<!--            <version>2021.0.5.0</version>-->
-<!--        </dependency>-->
-        <!-- Nacos 配置中心 -->
-<!--        <dependency>-->
-<!--            <groupId>com.alibaba.cloud</groupId>-->
-<!--            <artifactId>spring-cloud-starter-alibaba-nacos-config</artifactId>-->
-<!--            <version>2021.0.5.0</version>-->
-<!--        </dependency>-->
-        <!--	RabbitMQ	-->
+        <dependency>
+            <groupId>com.alibaba.cloud</groupId>
+            <artifactId>spring-cloud-starter-alibaba-nacos-discovery</artifactId>
+            <version>2021.0.5.0</version>
+        </dependency>
+<!--         Nacos 配置中心-->
+        <dependency>
+            <groupId>com.alibaba.cloud</groupId>
+            <artifactId>spring-cloud-starter-alibaba-nacos-config</artifactId>
+            <version>2021.0.5.0</version>
+        </dependency>
+<!--        	RabbitMQ-->
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-amqp</artifactId>