From 03fd80a313786ba55b827fa70f008e25e410ffb7 Mon Sep 17 00:00:00 2001
From: Jerry Yan <792602257@qq.com>
Date: Wed, 3 Sep 2025 14:33:36 +0800
Subject: [PATCH] =?UTF-8?q?fix(order):=20=E4=BF=AE=E5=A4=8D=E9=9B=B6?=
 =?UTF-8?q?=E5=85=83=E8=AE=A2=E5=8D=95=E7=8A=B6=E6=80=81=E8=AE=BE=E7=BD=AE?=
 =?UTF-8?q?=E9=80=BB=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 将订单状态设置逻辑移出 promo code块
- 确保所有支付价格为零的订单都设置为已支付状态
---
 .../ycwl/basic/service/pc/impl/OrderServiceImpl.java | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/main/java/com/ycwl/basic/service/pc/impl/OrderServiceImpl.java b/src/main/java/com/ycwl/basic/service/pc/impl/OrderServiceImpl.java
index ac7b5ee..0637a7d 100644
--- a/src/main/java/com/ycwl/basic/service/pc/impl/OrderServiceImpl.java
+++ b/src/main/java/com/ycwl/basic/service/pc/impl/OrderServiceImpl.java
@@ -795,12 +795,12 @@ public class OrderServiceImpl implements OrderService {
             order.setPrice(cachedResult.getFinalAmount());
             // promo code
             order.setPayPrice(cachedResult.getFinalAmount());
-            if (order.getPayPrice().equals(BigDecimal.ZERO)) {
-                order.setStatus(OrderStateEnum.PAID.getState());
-                order.setPayAt(new Date());
-            } else {
-                order.setStatus(OrderStateEnum.UNPAID.getState());
-            }
+        }
+        if (order.getPayPrice().equals(BigDecimal.ZERO)) {
+            order.setStatus(OrderStateEnum.PAID.getState());
+            order.setPayAt(new Date());
+        } else {
+            order.setStatus(OrderStateEnum.UNPAID.getState());
         }
 
         // coupon