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());