From 6b8361a1707e8e7806b2b0f71650086160a18443 Mon Sep 17 00:00:00 2001
From: 77 <77@77.com>
Date: Tue, 2 Apr 2024 00:58:54 +0800
Subject: [PATCH] 123

---
 .../cai/admin/{back => }/MemberPriceController.java         | 2 +-
 .../com/ruoyi/web/controller/cai/app/PayController.java     | 6 ++++--
 ruoyi-cai/src/main/java/com/ruoyi/cai/pay/PayManager.java   | 2 ++
 .../src/main/java/com/ruoyi/cai/pay/PayOrderInfoDTO.java    | 1 +
 4 files changed, 8 insertions(+), 3 deletions(-)
 rename ruoyi-admin/src/main/java/com/ruoyi/web/controller/cai/admin/{back => }/MemberPriceController.java (98%)

diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/cai/admin/back/MemberPriceController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/cai/admin/MemberPriceController.java
similarity index 98%
rename from ruoyi-admin/src/main/java/com/ruoyi/web/controller/cai/admin/back/MemberPriceController.java
rename to ruoyi-admin/src/main/java/com/ruoyi/web/controller/cai/admin/MemberPriceController.java
index 4addb99a..73e307db 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/cai/admin/back/MemberPriceController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/cai/admin/MemberPriceController.java
@@ -1,4 +1,4 @@
-package com.ruoyi.web.controller.cai.admin.back;
+package com.ruoyi.web.controller.cai.admin;
 
 import cn.dev33.satoken.annotation.SaCheckPermission;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/cai/app/PayController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/cai/app/PayController.java
index ae573653..150f5296 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/cai/app/PayController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/cai/app/PayController.java
@@ -2,6 +2,7 @@ package com.ruoyi.web.controller.cai.app;
 
 import cn.dev33.satoken.annotation.SaIgnore;
 import com.alibaba.fastjson2.JSON;
+import com.alibaba.fastjson2.JSONObject;
 import com.alipay.api.AlipayApiException;
 import com.alipay.api.domain.AlipayTradeAppPayModel;
 import com.alipay.api.internal.util.AlipaySignature;
@@ -68,7 +69,7 @@ public class PayController {
                 .mch_id(payConfig.getWxMcid())
                 .nonce_str(WxPayKit.generateStr())
                 .body(payOrderInfo.getBody())
-                .out_trade_no(WxPayKit.generateStr())
+                .out_trade_no(payOrderInfo.getOrderNo())
                 .total_fee(payOrderInfo.getPriceFenStr())
                 .spbill_create_ip(ip)
                 .notify_url(payConfig.getNotifyUrl()+NOTIFY_WX_URL)
@@ -117,7 +118,7 @@ public class PayController {
             AlipayTradeAppPayModel model = new AlipayTradeAppPayModel();
             model.setBody(payOrderInfo.getBody());
             model.setSubject(payOrderInfo.getSubject());
-            model.setOutTradeNo(WxPayKit.generateStr());
+            model.setOutTradeNo(payOrderInfo.getOrderNo());
             model.setTimeoutExpress("30m");
             model.setTotalAmount(payOrderInfo.getPrice().toString());
             String notifyUrl = AliPayApiConfigKit.getAliPayApiConfig().getServiceUrl();
@@ -190,4 +191,5 @@ public class PayController {
             return "failure";
         }
     }
+
 }
diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/pay/PayManager.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/pay/PayManager.java
index 9797704a..c6a32724 100644
--- a/ruoyi-cai/src/main/java/com/ruoyi/cai/pay/PayManager.java
+++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/pay/PayManager.java
@@ -52,6 +52,7 @@ public class PayManager {
                 dto.setBody(vipOrder.getVipName());
                 dto.setSubject(vipOrder.getVipName());
                 dto.setPrice(vipOrder.getPrice());
+                dto.setOrderNo(vipOrder.getOrderNo());
                 break;
             case RECHARGE_ORDER_SUB:
                 RechargeOrder rechargeOrder = rechargeOrderService.getByOrderNo(orderNo);
@@ -65,6 +66,7 @@ public class PayManager {
                 dto.setBody(rechargeOrder.getRechargeName());
                 dto.setSubject(rechargeOrder.getRechargeName());
                 dto.setPrice(rechargeOrder.getPrice());
+                dto.setOrderNo(rechargeOrder.getOrderNo());
                 break;
             default:
                 break;
diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/pay/PayOrderInfoDTO.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/pay/PayOrderInfoDTO.java
index d882b4c1..1bdb94dc 100644
--- a/ruoyi-cai/src/main/java/com/ruoyi/cai/pay/PayOrderInfoDTO.java
+++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/pay/PayOrderInfoDTO.java
@@ -10,6 +10,7 @@ public class PayOrderInfoDTO {
     private String body;
     private String subject;
     private BigDecimal price;
+    private String orderNo;
 
     public String getPriceFenStr(){
         return NumberUtil.mul(price,100).longValue()+"";