From e3a2245265516fef78b4737d6fffc939e7c5e0af Mon Sep 17 00:00:00 2001
From: huliguo <2023611923@qq.com>
Date: 星期四, 03 七月 2025 17:56:07 +0800
Subject: [PATCH] bug修改

---
 pt-admin/src/main/java/com/ruoyi/web/controller/errand/VipOrderController.java |   23 ++++++++++++++++++-----
 1 files changed, 18 insertions(+), 5 deletions(-)

diff --git a/pt-admin/src/main/java/com/ruoyi/web/controller/errand/VipOrderController.java b/pt-admin/src/main/java/com/ruoyi/web/controller/errand/VipOrderController.java
index 57a502b..73d2c8d 100644
--- a/pt-admin/src/main/java/com/ruoyi/web/controller/errand/VipOrderController.java
+++ b/pt-admin/src/main/java/com/ruoyi/web/controller/errand/VipOrderController.java
@@ -5,12 +5,15 @@
 import com.ruoyi.errand.object.dto.app.VipPaymentDTO;
 import com.ruoyi.errand.service.VipOrderService;
 import com.ruoyi.errand.utils.UniPayCallbackResult;
+import com.ruoyi.errand.utils.wx.PayResult;
+import com.ruoyi.errand.utils.wx.WechatPayService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
+import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import javax.validation.Valid;
 import java.io.IOException;
@@ -23,6 +26,9 @@
 public class VipOrderController {
     @Autowired
     private VipOrderService vipOrderService;
+
+    @Autowired
+    private WechatPayService wechatPayService;
 
 
     /**
@@ -39,11 +45,18 @@
      * 订单支付回调通知
      */
     @ResponseBody
-    @GetMapping("/orderPaymentCallback")
-    public void orderPaymentCallback(UniPayCallbackResult uniPayCallbackResult, HttpServletResponse response){
-        String jsonString = JSONObject.toJSONString(uniPayCallbackResult);
-        log.info("订单支付回调json:{}", jsonString);
-        R callback = vipOrderService.orderPaymentCallback(uniPayCallbackResult);
+    @PostMapping("/orderPaymentCallback")
+    public void orderPaymentCallback(HttpServletRequest request, HttpServletResponse response){
+        System.err.println("1111111111111");
+        PayResult payResult= null;
+        try {
+            payResult = wechatPayService.processNotify(request);
+        } catch (Exception e) {
+            throw new RuntimeException(e);
+        }
+        System.out.println("1111111111111111111111");
+//        System.out.println(jsonString);
+        R callback = vipOrderService.orderPaymentCallback(payResult);
         if(callback.getCode() == 200){
             response.setStatus(200);
             PrintWriter out = null;

--
Gitblit v1.7.1