From ce5740d1928125492e9b014154ae2f924c0dee85 Mon Sep 17 00:00:00 2001
From: GYJ <1157756119@qq.com>
Date: Wed, 4 Dec 2024 14:49:55 +0800
Subject: [PATCH] =?UTF-8?q?=E6=94=AF=E4=BB=98=E8=AE=A2=E5=8D=95=E8=AF=B7?=
 =?UTF-8?q?=E6=B1=82=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modules/pay/controller/app/WuyouController.java | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/src/main/java/com/sqx/modules/pay/controller/app/WuyouController.java b/src/main/java/com/sqx/modules/pay/controller/app/WuyouController.java
index ab1ff902..92c1be3d 100644
--- a/src/main/java/com/sqx/modules/pay/controller/app/WuyouController.java
+++ b/src/main/java/com/sqx/modules/pay/controller/app/WuyouController.java
@@ -14,12 +14,14 @@ import com.sqx.modules.pay.wuyou.BaseResp;
 import com.sqx.modules.pay.wuyou.Encrypt;
 import com.sqx.modules.pay.wuyou.NotifyDto;
 import com.sqx.modules.pay.wuyou.WuyouPay;
+import com.sqx.modules.utils.AliPayOrderUtil;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.web.bind.annotation.*;
 
 import javax.servlet.http.HttpServletRequest;
+import javax.ws.rs.PathParam;
 import java.math.BigDecimal;
 import java.text.SimpleDateFormat;
 import java.util.Date;
@@ -50,8 +52,8 @@ public class WuyouController {
     }
 
     @ApiOperation("支付订单")
-    @PostMapping("/payOrder")
-    public Result payOrder(HttpServletRequest request, @RequestBody Long orderId, @RequestAttribute("userId") Long userId) {
+    @GetMapping("/payOrder/{orderId}")
+    public Result payOrder(HttpServletRequest request, @PathVariable("orderId") Long orderId) {
         Orders order = ordersService.getById(orderId);
         if (order == null) {
             return Result.error("订单不存在");
@@ -61,10 +63,6 @@ public class WuyouController {
             return Result.error("订单已支付");
         }
 
-        if (!order.getUserId().equals(userId)) {
-            return Result.error("订单不属于当前用户");
-        }
-
         PayDetails payDetails = payDetailsDao.selectByOrderId(order.getOrdersNo());
         if (payDetails == null) {
             payDetails = new PayDetails();
@@ -76,6 +74,9 @@ public class WuyouController {
             payDetails.setType(1);
             payDetails.setClassify(9);
             payDetailsDao.insert(payDetails);
+        } else {
+            payDetails.setOrderId(AliPayOrderUtil.createOrderId());
+            payDetailsDao.updateById(payDetails);
         }
 
         BaseResp baseResp = WuyouPay.payOrder(order.getOrdersNo(), order.getPayMoney().toString(), request.getHeader("User-Agent"));