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-13 11:32:09 +08:00
parent 8726cb1fc3
commit 97d2092137
2 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -57,7 +57,8 @@ def calculate_price(price_request: OrderPriceCalculateRequest,user: UserDB,db: S
coupon_discount_amount=0, coupon_discount_amount=0,
points_discount_amount=0, points_discount_amount=0,
final_amount=settings.ORDER_BASE_PRICE final_amount=settings.ORDER_BASE_PRICE
) ),
price_detail_text=settings.ORDER_PREORDER_PRICE_TEXT
) )
original_amount = settings.ORDER_BASE_PRICE original_amount = settings.ORDER_BASE_PRICE
@ -122,10 +123,7 @@ async def pre_order(
"""预下单 - 计算价格""" """预下单 - 计算价格"""
price_info = calculate_price(request, current_user, db) price_info = calculate_price(request, current_user, db)
return success_response(data={ return success_response(data=price_info)
"price_info": price_info,
"price_detail_text" : settings.ORDER_PREORDER_PRICE_TEXT
})
@router.post("", response_model=ResponseModel) @router.post("", response_model=ResponseModel)
async def create_shipping_order( async def create_shipping_order(

3
app/models/order.py
View File

@ -140,4 +140,5 @@ class OrderPriceResult(BaseModel):
"""订单价格计算结果""" """订单价格计算结果"""
price_info: OrderPriceInfo price_info: OrderPriceInfo
used_coupon_id: Optional[int] = None # 使用的优惠券ID used_coupon_id: Optional[int] = None # 使用的优惠券ID
used_points: Optional[int] = None # 使用的积分数 used_points: Optional[int] = None # 使用的积分数
price_detail_text: Optional[str] = None # 价格详情文本