diff --git a/app/api/endpoints/order.py b/app/api/endpoints/order.py index 565794d..2cba28c 100644 --- a/app/api/endpoints/order.py +++ b/app/api/endpoints/order.py @@ -320,7 +320,8 @@ async def create_order( sent_order_status_change_message, openid=current_user.mp_openid, template_id=settings.DELIVERY_ORDER_CREATED_TEMPLATE_ID, - data=data + data=data, + orderid=db_order.orderid ) # 超过晚上8点,则使用明天送达的文案 @@ -739,7 +740,8 @@ async def cancel_order( sent_order_status_change_message, openid=current_user.mp_openid, template_id=settings.DELIVERY_ORDER_CANCELLED_TEMPLATE_ID, - data=data + data=data, + orderid=order.orderid ) return success_response( @@ -956,7 +958,8 @@ async def deliveryman_cancel_order( sent_order_status_change_message, openid=order_user.mp_openid, template_id=settings.DELIVERY_ORDER_CANCELLED_TEMPLATE_ID, - data=data + data=data, + orderid=order.orderid ) return success_response( @@ -1046,7 +1049,8 @@ async def complete_order( sent_order_status_change_message, openid=order_user.mp_openid, template_id=settings.DELIVERY_ORDER_COMPLETED_TEMPLATE_ID, - data=data + data=data, + orderid=order.orderid ) return success_response( @@ -1124,9 +1128,10 @@ async def receive_order( sent_order_status_change_message, openid=order_user.mp_openid, template_id=settings.DELIVERY_ORDER_RECEIVED_TEMPLATE_ID, - data=data + data=data, + orderid=order.orderid ) - + return success_response( message="接单成功", data=OrderInfo.model_validate(order) diff --git a/app/core/mpmessage.py b/app/core/mpmessage.py index cbe39d9..081f31f 100644 --- a/app/core/mpmessage.py +++ b/app/core/mpmessage.py @@ -5,7 +5,7 @@ import logging # 发送订单状态改变消息 -async def sent_order_status_change_message(openid: str, template_id: str, data: dict): +async def sent_order_status_change_message(openid: str, orderid: str, template_id: str, data: dict): try: await mp_client.send_template_message( @@ -14,7 +14,7 @@ async def sent_order_status_change_message(openid: str, template_id: str, data: data=data, miniprogram={ "appid": settings.WECHAT_APPID, - "path": f"/pages/order/detail/index?id={data.orderid}" + "path": f"/pages/order/detail/index?id={orderid}" } ) except Exception as e: