From 0823c42cbcc7f6b8328afa79a7e33eb57132fa19 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=B5=B5=E5=BF=A0=E6=9E=97?= <170083662@qq.com>
Date: Mon, 23 Mar 2026 11:07:53 +0800
Subject: [PATCH] =?UTF-8?q?fix(order):=20=E4=BF=AE=E5=A4=8D=E8=AE=A2?=
 =?UTF-8?q?=E5=8D=95=E7=8A=B6=E6=80=81=E6=9B=B4=E6=96=B0=E9=80=BB=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 添加条件判断确保只有当订单状态为2时才更新为0
- 防止已发货或已完成的订单被错误重置为待支付状态
- 保持支付成功后的其他订单属性更新逻辑不变
---
 .../com/gxwebsoft/shop/service/impl/ShopOrderServiceImpl.java | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/main/java/com/gxwebsoft/shop/service/impl/ShopOrderServiceImpl.java b/src/main/java/com/gxwebsoft/shop/service/impl/ShopOrderServiceImpl.java
index 385f487..6c1d60d 100644
--- a/src/main/java/com/gxwebsoft/shop/service/impl/ShopOrderServiceImpl.java
+++ b/src/main/java/com/gxwebsoft/shop/service/impl/ShopOrderServiceImpl.java
@@ -490,7 +490,9 @@ public class ShopOrderServiceImpl extends ServiceImpl<ShopOrderMapper, ShopOrder
             if (result.getTradeState().equals(Transaction.TradeStateEnum.SUCCESS)) {
                 shopOrder.setPayStatus(true);
                 shopOrder.setPayTime(shopOrder.getCreateTime());
-                shopOrder.setOrderStatus(0);
+                if(shopOrder.getOrderStatus().equals(2)){
+                  shopOrder.setOrderStatus(0);
+                }
                 shopOrder.setTransactionId(result.getTransactionId());
                 updateById(shopOrder);
                 return true;