From befeb07facc0a6d0a5c2baef2c2d320813df4144 Mon Sep 17 00:00:00 2001
From: Dftre <3066417822@qq.com>
Date: Tue, 11 Jun 2024 01:08:58 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4=E8=AE=A2=E5=8D=95=E6=A8=A1?=
 =?UTF-8?q?=E5=9D=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/resources/application-pay.yml    | 24 +++++++++++--------
 .../{constant => config}/DySmsConfig.java     |  2 +-
 .../com/ruoyi/tfa/phone/utils/DySmsUtil.java  |  2 +-
 .../resources/mapper/pay/PayOrderMapper.xml   |  2 +-
 .../pay/wx/controller/WxPayController.java    | 10 ++++----
 5 files changed, 21 insertions(+), 19 deletions(-)
 rename ruoyi-auth/ruoyi-tfa-phone/src/main/java/com/ruoyi/tfa/phone/{constant => config}/DySmsConfig.java (95%)

diff --git a/ruoyi-admin/src/main/resources/application-pay.yml b/ruoyi-admin/src/main/resources/application-pay.yml
index 6866d71..e88b557 100644
--- a/ruoyi-admin/src/main/resources/application-pay.yml
+++ b/ruoyi-admin/src/main/resources/application-pay.yml
@@ -8,16 +8,20 @@ pay:
     vendorSn: "vendorSn"
     vendorKey: "vendorKey"
   alipay:
-    enabled: false
-    appId: appId
-    appPrivateKey: appPrivateKey #classpath:pay/alipay/alipay_private_key.pem
-    alipayPublicKey: alipayPublicKey #classpath:pay/alipay/alipay_public_key.pem
-    notifyUrl: http://www.sdaizy.com/prod-api/alipay/notify
+    enabled: true
+    # 应用id
+    appId: appid
+    # 应用私钥
+    appPrivateKey: classpath:pay/alipay/alipay_private_key.pem
+    # 支付宝公钥
+    alipayPublicKey: classpath:pay/alipay/alipay_public_key.pem
+    notifyUrl: http://e2vca6.natappfree.cc/alipay/notify
   wechat:
     enabled: false
-    merchantId: merchantId
-    privateKeyPath: privateKeyPath # classpath:pay/wx/apiclient_key.pem
-    merchantSerialNumber: merchantSerialNumber
+    appId: appid
     apiV3Key: apiV3Key
-    appId: appId
-    notifyUrl: http://g5vdrz.natappfree.cc/wxPay/notify
+    privateKeyPath: classpath:pay/wx/apiclient_key.pem
+    merchantId: merchantId
+    merchantSerialNumber: merchantSerialNumber
+    # 回调地址，此处使用的内网穿透http://e2vca6.natappfree.cc
+    notifyUrl: http://e2vca6.natappfree.cc/pay/wechat/notify
diff --git a/ruoyi-auth/ruoyi-tfa-phone/src/main/java/com/ruoyi/tfa/phone/constant/DySmsConfig.java b/ruoyi-auth/ruoyi-tfa-phone/src/main/java/com/ruoyi/tfa/phone/config/DySmsConfig.java
similarity index 95%
rename from ruoyi-auth/ruoyi-tfa-phone/src/main/java/com/ruoyi/tfa/phone/constant/DySmsConfig.java
rename to ruoyi-auth/ruoyi-tfa-phone/src/main/java/com/ruoyi/tfa/phone/config/DySmsConfig.java
index 058fd1d..5cfeec7 100644
--- a/ruoyi-auth/ruoyi-tfa-phone/src/main/java/com/ruoyi/tfa/phone/constant/DySmsConfig.java
+++ b/ruoyi-auth/ruoyi-tfa-phone/src/main/java/com/ruoyi/tfa/phone/config/DySmsConfig.java
@@ -1,4 +1,4 @@
-package com.ruoyi.tfa.phone.constant;
+package com.ruoyi.tfa.phone.config;
 
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.context.annotation.Configuration;
diff --git a/ruoyi-auth/ruoyi-tfa-phone/src/main/java/com/ruoyi/tfa/phone/utils/DySmsUtil.java b/ruoyi-auth/ruoyi-tfa-phone/src/main/java/com/ruoyi/tfa/phone/utils/DySmsUtil.java
index e4d1520..5d8badb 100644
--- a/ruoyi-auth/ruoyi-tfa-phone/src/main/java/com/ruoyi/tfa/phone/utils/DySmsUtil.java
+++ b/ruoyi-auth/ruoyi-tfa-phone/src/main/java/com/ruoyi/tfa/phone/utils/DySmsUtil.java
@@ -12,7 +12,7 @@ import com.aliyun.teaopenapi.models.Config;
 import com.aliyun.teautil.Common;
 import com.aliyun.teautil.models.RuntimeOptions;
 import com.ruoyi.common.utils.spring.SpringUtils;
-import com.ruoyi.tfa.phone.constant.DySmsConfig;
+import com.ruoyi.tfa.phone.config.DySmsConfig;
 import com.ruoyi.tfa.phone.enums.DySmsTemplate;
 
 public class DySmsUtil {
diff --git a/ruoyi-pay/ruoyi-pay-common/src/main/resources/mapper/pay/PayOrderMapper.xml b/ruoyi-pay/ruoyi-pay-common/src/main/resources/mapper/pay/PayOrderMapper.xml
index 2c14d94..c085f8b 100644
--- a/ruoyi-pay/ruoyi-pay-common/src/main/resources/mapper/pay/PayOrderMapper.xml
+++ b/ruoyi-pay/ruoyi-pay-common/src/main/resources/mapper/pay/PayOrderMapper.xml
@@ -14,7 +14,7 @@
         <result property="orderMessage" column="order_message" />
     </resultMap>
 
-    <sql id="selectPayOrderVo"> select order_id, user_id, order_number, order_status, total_amount,
+    <sql id="selectPayOrderVo"> select order_id, user_id, order_number, order_status, total_amount,actual_amount,
         order_content, order_remark, order_message from pay_order </sql>
 
     <select id="selectPayOrderList" parameterType="PayOrder" resultMap="PayOrderResult">
diff --git a/ruoyi-pay/ruoyi-pay-wx/src/main/java/com/ruoyi/pay/wx/controller/WxPayController.java b/ruoyi-pay/ruoyi-pay-wx/src/main/java/com/ruoyi/pay/wx/controller/WxPayController.java
index 67a6282..b94584c 100644
--- a/ruoyi-pay/ruoyi-pay-wx/src/main/java/com/ruoyi/pay/wx/controller/WxPayController.java
+++ b/ruoyi-pay/ruoyi-pay-wx/src/main/java/com/ruoyi/pay/wx/controller/WxPayController.java
@@ -15,6 +15,7 @@ import org.springframework.web.bind.annotation.RestController;
 import com.ruoyi.common.annotation.Anonymous;
 import com.ruoyi.common.core.controller.BaseController;
 import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.common.core.domain.R;
 import com.ruoyi.pay.domain.PayOrder;
 import com.ruoyi.pay.service.IPayOrderService;
 import com.ruoyi.pay.wx.config.WxPayConfig;
@@ -60,14 +61,11 @@ public class WxPayController extends BaseController {
             @Parameter(name = "orderNumber", description = "订单号", required = true)
     })
     @GetMapping("/url/{orderNumber}")
-    public AjaxResult url(@PathVariable(name = "orderNumber") String orderNumber) throws Exception {
+    public R<String> url(@PathVariable(name = "orderNumber") String orderNumber) throws Exception {
         PayOrder aliPay = payOrderService.selectPayOrderByOrderNumber(orderNumber);
-        String amountStr = aliPay.getActualAmount();
-        double amountDouble = Double.parseDouble(amountStr);
-        int totalAmountInt = (int) (amountDouble * 100);
         PrepayRequest request = new PrepayRequest();
         Amount amount = new Amount();
-        amount.setTotal(totalAmountInt);
+        amount.setTotal(Integer.parseInt(aliPay.getActualAmount()));
         request.setAmount(amount);
         request.setAppid(wxPayAppConfig.getAppId());
         request.setMchid(wxPayAppConfig.getWxchantId());
@@ -75,7 +73,7 @@ public class WxPayController extends BaseController {
         request.setNotifyUrl(wxPayAppConfig.getNotifyUrl());
         request.setOutTradeNo(aliPay.getOrderNumber());
         PrepayResponse response = nativePayService.prepay(request);
-        return success(response.getCodeUrl());
+        return R.ok(response.getCodeUrl());
     }
 
     @Anonymous