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-03-27 16:37:30 +08:00
parent 2ae1e48939
commit e7829d642f
2 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
app/api/endpoints/merchant_order.py
View File

@ -278,7 +278,7 @@ async def complete_order(
order_id = order.order_id order_id = order.order_id
) )
# 发送商家订单完成消息
user = db.query(UserDB).filter( user = db.query(UserDB).filter(
UserDB.userid == order.user_id UserDB.userid == order.user_id
).first() ).first()
@ -291,6 +291,7 @@ async def complete_order(
db.commit() db.commit()
# 发送商家订单完成消息
if user and user.mp_openid: if user and user.mp_openid:
data={ data={
"character_string7": order_id, "character_string7": order_id,
@ -339,9 +340,6 @@ async def accept_order(
if not product: if not product:
return error_response(code=404, message="商品不存在") return error_response(code=404, message="商品不存在")
if product.delivery_type != DeliveryType.PICKUP:
return error_response(code=400, message="商品类型不正确")
if order.status != MerchantOrderStatus.PENDING: if order.status != MerchantOrderStatus.PENDING:
return error_response(code=400, message="订单状态不正确") return error_response(code=400, message="订单状态不正确")

BIN
jobs.sqlite
View File

Binary file not shown.