update

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: