update
This commit is contained in:
parent
7c173463db
commit
3f5bc4b373
@ -504,6 +504,8 @@ async def get_order_detail(
|
|||||||
# 计算配送员配送费用
|
# 计算配送员配送费用
|
||||||
deliveryman_share = order.delivery_share if order.delivery_share > 0 else calculate_delivery_share(order, db)
|
deliveryman_share = order.delivery_share if order.delivery_share > 0 else calculate_delivery_share(order, db)
|
||||||
|
|
||||||
|
base_delivery_amount = order.original_amount - (order.more_station_price if order.more_station_price is not None else 0)
|
||||||
|
|
||||||
# 构建响应数据
|
# 构建响应数据
|
||||||
order_data = {
|
order_data = {
|
||||||
"orderid": order.orderid,
|
"orderid": order.orderid,
|
||||||
@ -513,7 +515,7 @@ async def get_order_detail(
|
|||||||
"pickup_code_count": order.pickup_code_count,
|
"pickup_code_count": order.pickup_code_count,
|
||||||
"pickup_images_count": order.pickup_images_count,
|
"pickup_images_count": order.pickup_images_count,
|
||||||
"original_amount": order.original_amount,
|
"original_amount": order.original_amount,
|
||||||
"base_delivery_amount": order.original_amount - order.more_station_price,
|
"base_delivery_amount": base_delivery_amount,
|
||||||
"coupon_discount_amount": order.coupon_discount_amount,
|
"coupon_discount_amount": order.coupon_discount_amount,
|
||||||
"point_discount_amount": order.point_discount_amount,
|
"point_discount_amount": order.point_discount_amount,
|
||||||
"more_station_price": order.more_station_price,
|
"more_station_price": order.more_station_price,
|
||||||
|
|||||||
BIN
jobs.sqlite
BIN
jobs.sqlite
Binary file not shown.
Loading…
Reference in New Issue
Block a user