From 1888d82f583a3bab4e664cd319cfa2e871aa307f Mon Sep 17 00:00:00 2001
From: Agent <agent@openclaw.ai>
Date: Sat, 28 Mar 2026 03:10:44 +0000
Subject: [PATCH] =?UTF-8?q?fix:=20=E5=90=8E=E7=AB=AF=E6=9B=B4=E6=96=B0?=
 =?UTF-8?q?=E8=AE=A2=E5=8D=95=E6=97=B6=E5=A4=84=E7=90=86discountMoney?=
 =?UTF-8?q?=E5=AD=97=E6=AE=B5=EF=BC=8C=E4=BF=AE=E5=A4=8Dstatus=E4=B8=BAnul?=
 =?UTF-8?q?l=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/example/building/service/impl/OrderServiceImpl.java    | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/main/java/com/example/building/service/impl/OrderServiceImpl.java b/src/main/java/com/example/building/service/impl/OrderServiceImpl.java
index 15c7980..5355a9c 100644
--- a/src/main/java/com/example/building/service/impl/OrderServiceImpl.java
+++ b/src/main/java/com/example/building/service/impl/OrderServiceImpl.java
@@ -295,7 +295,7 @@ public class OrderServiceImpl implements OrderService {
         }
         
         // 只有未完成状态可以编辑
-        if (order.getStatus() != 0) {
+        if (order.getStatus() == null || order.getStatus() != 0) {
             throw new RuntimeException("订单状态不允许编辑");
         }
         
@@ -317,6 +317,7 @@ public class OrderServiceImpl implements OrderService {
         
         // 更新折扣和备注
         order.setDiscountRate(request.getDiscountRate() != null ? request.getDiscountRate() : new BigDecimal("100"));
+        order.setDiscountMoney(request.getDiscountMoney() != null ? request.getDiscountMoney() : BigDecimal.ZERO);
         order.setRemark(request.getRemark());
         order.setPaymentMethod(request.getPaymentMethod());