From feb9d87ddfa19edb06f85b2cb04eda79673efe6e Mon Sep 17 00:00:00 2001
From: aaron <>
Date: Wed, 19 Feb 2025 14:10:42 +0800
Subject: [PATCH] update

---
 app/api/endpoints/order.py | 5 +++--
 app/core/response.py       | 5 +++--
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/app/api/endpoints/order.py b/app/api/endpoints/order.py
index f63fb34..fcab120 100644
--- a/app/api/endpoints/order.py
+++ b/app/api/endpoints/order.py
@@ -119,10 +119,11 @@ async def pre_order(
     # 检查是否有未支付的订单
     unpay_order = db.query(ShippingOrderDB).filter(
         ShippingOrderDB.userid == current_user.userid,
-        ShippingOrderDB.status == OrderStatus.UNPAID
+        ShippingOrderDB.status.not_in([OrderStatus.CANCELLED, OrderStatus.COMPLETED])
     ).first()
+    
     if unpay_order:
-        return error_response(code=400, message="存在未支付的订单", data={
+        return error_response(code=400, message="存在未完成的订单", data={
             "orderid": unpay_order.orderid
         })
 
diff --git a/app/core/response.py b/app/core/response.py
index 4658813..ab1c7aa 100644
--- a/app/core/response.py
+++ b/app/core/response.py
@@ -42,8 +42,9 @@ def success_response(*, data: Any = None, message: str = "success") -> CustomJSO
         data=data
     ).json_response()
 
-def error_response(*, code: int = 400, message: str) -> CustomJSONResponse:
+def error_response(*, code: int = 400, message: str, data: Any = None) -> CustomJSONResponse:
     return ResponseModel(
         code=code,
-        message=message
+        message=message,
+        data=data
     ).json_response()
\ No newline at end of file