This commit is contained in:
aaron 2025-02-19 16:42:46 +08:00
parent 1fc1141478
commit 86c148816e

View File

@ -33,6 +33,7 @@ import logging
from sqlalchemy import func from sqlalchemy import func
from app.core.mpclient import mp_client from app.core.mpclient import mp_client
from datetime import timedelta from datetime import timedelta
from app.core.imageprocessor import process_image, ImageFormat
router = APIRouter() router = APIRouter()
@ -314,8 +315,15 @@ async def get_order_detail(
deliveryman_user_avatar = None deliveryman_user_avatar = None
deliveryman_user_phone = None deliveryman_user_phone = None
# 计算配送员分账金额
deliveryman_share = round(order.original_amount * settings.ORDER_DELIVERYMAN_SHARE_RATIO, 1) deliveryman_share = round(order.original_amount * settings.ORDER_DELIVERYMAN_SHARE_RATIO, 1)
# 构建完成图片
complete_images = []
if order.complete_images:
complete_images = order.complete_images.split(",")
complete_images = [process_image(image).thumbnail(500, 500).format(ImageFormat.WEBP).build() for image in complete_images]
# 构建响应数据 # 构建响应数据
order_data = { order_data = {
"orderid": order.orderid, "orderid": order.orderid,
@ -327,7 +335,7 @@ async def get_order_detail(
"final_amount": order.final_amount, "final_amount": order.final_amount,
"deliveryman_share": deliveryman_share, "deliveryman_share": deliveryman_share,
"status": order.status, "status": order.status,
"complete_images": order.complete_images.split(",") if order.complete_images else None, "complete_images": complete_images,
"create_time": order.create_time, "create_time": order.create_time,
"complete_time": order.completed_time, "complete_time": order.completed_time,