deliveryman/deliveryman-api
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

update

Browse Source
This commit is contained in:
aaron 2025-02-19 14:10:42 +08:00
parent bb777b29c1
commit feb9d87ddf
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
app/api/endpoints/order.py
View File

@ -119,10 +119,11 @@ async def pre_order(
# 检查是否有未支付的订单 # 检查是否有未支付的订单
unpay_order = db.query(ShippingOrderDB).filter( unpay_order = db.query(ShippingOrderDB).filter(
ShippingOrderDB.userid == current_user.userid, ShippingOrderDB.userid == current_user.userid,
ShippingOrderDB.status == OrderStatus.UNPAID ShippingOrderDB.status.not_in([OrderStatus.CANCELLED, OrderStatus.COMPLETED])
).first() ).first()
if unpay_order: if unpay_order:
return error_response(code=400, message="存在未支付的订单", data={ return error_response(code=400, message="存在未完成的订单", data={
"orderid": unpay_order.orderid "orderid": unpay_order.orderid
}) })

5
app/core/response.py
View File

@ -42,8 +42,9 @@ def success_response(*, data: Any = None, message: str = "success") -> CustomJSO
data=data data=data
).json_response() ).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( return ResponseModel(
code=code, code=code,
message=message message=message,
data=data
).json_response() ).json_response()