From fbf564795cc3631f4aebdc3fb33a9906e19c563f Mon Sep 17 00:00:00 2001
From: aaron <>
Date: Thu, 27 Mar 2025 17:38:51 +0800
Subject: [PATCH] update

---
 app/api/endpoints/merchant_order.py |   9 ++++++++-
 jobs.sqlite                         | Bin 24576 -> 24576 bytes
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/app/api/endpoints/merchant_order.py b/app/api/endpoints/merchant_order.py
index 5eb6e4f..c7e8176 100644
--- a/app/api/endpoints/merchant_order.py
+++ b/app/api/endpoints/merchant_order.py
@@ -254,9 +254,16 @@ async def complete_order(
     merchant_user: UserDB = Depends(get_merchant_user)
 ):
     """商家完成订单"""
+
+    merchant = db.query(MerchantDB).filter(
+        MerchantDB.user_id == merchant_user.userid
+    ).first()
+    if not merchant:
+        return error_response(code=404, message="商家不存在")
+
     order = db.query(MerchantOrderDB).filter(   
         MerchantOrderDB.order_id == order_id,
-        MerchantOrderDB.merchant_id == merchant_user.userid
+        MerchantOrderDB.merchant_id == merchant.id
     ).first()
 
     if not order:
diff --git a/jobs.sqlite b/jobs.sqlite
index 901ed2aebf51bdac12169d31ebdb05788b6947af..19bc42f4eab9a1c16d87b492ff4ed2206a292fbb 100644
GIT binary patch
delta 19
acmZoTz}Rqrae_2s{zMsP#{7*53*rGr=?4w~

delta 19
acmZoTz}Rqrae_2s_Cy(H#_Wv=3*rGrtp^4G