添加成功文案
This commit is contained in:
parent
cd07bd04ba
commit
649dc88b3a
@ -109,6 +109,17 @@ async def pre_order(
|
|||||||
db: Session = Depends(get_db),
|
db: Session = Depends(get_db),
|
||||||
current_user: UserDB = Depends(get_current_user)
|
current_user: UserDB = Depends(get_current_user)
|
||||||
):
|
):
|
||||||
|
|
||||||
|
# 检查是否有未支付的订单
|
||||||
|
unpay_order = db.query(ShippingOrderDB).filter(
|
||||||
|
ShippingOrderDB.userid == current_user.userid,
|
||||||
|
ShippingOrderDB.status == OrderStatus.UNPAID
|
||||||
|
).first()
|
||||||
|
if unpay_order:
|
||||||
|
return error_response(code=400, message="存在未支付的订单", data={
|
||||||
|
"orderid": unpay_order.orderid
|
||||||
|
})
|
||||||
|
|
||||||
"""预下单 - 计算价格"""
|
"""预下单 - 计算价格"""
|
||||||
price_info = calculate_price(request, current_user, db)
|
price_info = calculate_price(request, current_user, db)
|
||||||
return success_response(data=price_info)
|
return success_response(data=price_info)
|
||||||
@ -208,7 +219,8 @@ async def create_shipping_order(
|
|||||||
message="订单创建成功",
|
message="订单创建成功",
|
||||||
data={
|
data={
|
||||||
"order": OrderInfo.model_validate(db_order),
|
"order": OrderInfo.model_validate(db_order),
|
||||||
"packages": [OrderPackageInfo.model_validate(p) for p in packages]
|
"packages": [OrderPackageInfo.model_validate(p) for p in packages],
|
||||||
|
"success_text" : settings.ORDER_SUCCESS_TEXT
|
||||||
}
|
}
|
||||||
)
|
)
|
||||||
except Exception as e:
|
except Exception as e:
|
||||||
|
|||||||
@ -18,6 +18,9 @@ class Settings(BaseSettings):
|
|||||||
ORDER_EXTRA_PACKAGE_THRESHOLD: int = 5 # 额外收费阈值
|
ORDER_EXTRA_PACKAGE_THRESHOLD: int = 5 # 额外收费阈值
|
||||||
ORDER_DELIVERYMAN_SHARE_RATIO: float = 0.8 # 配送员分账比例
|
ORDER_DELIVERYMAN_SHARE_RATIO: float = 0.8 # 配送员分账比例
|
||||||
|
|
||||||
|
#订单创建成功文案
|
||||||
|
ORDER_SUCCESS_TEXT: str = "订单预计今晚前送达,请注意查收"
|
||||||
|
|
||||||
# JWT 配置
|
# JWT 配置
|
||||||
SECRET_KEY: str = "s10GmiRMmplfYWXYZLSsE3X36Ld4gVZxHgAcdqFGC20v3llv7UdOeWLBEEP3e40p"
|
SECRET_KEY: str = "s10GmiRMmplfYWXYZLSsE3X36Ld4gVZxHgAcdqFGC20v3llv7UdOeWLBEEP3e40p"
|
||||||
ACCESS_TOKEN_EXPIRE_MINUTES: Optional[int] = None # None 表示永不过期
|
ACCESS_TOKEN_EXPIRE_MINUTES: Optional[int] = None # None 表示永不过期
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user