From 2ae1e48939c4d22708cac4c74e0b05248bfb3637 Mon Sep 17 00:00:00 2001
From: aaron <>
Date: Thu, 27 Mar 2025 16:33:02 +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 75b6513..b0bed2c 100644
--- a/app/api/endpoints/merchant_order.py
+++ b/app/api/endpoints/merchant_order.py
@@ -161,6 +161,7 @@ async def get_merchant_orders(
             MerchantOrderDB.status == status
         )
     total = query.count()
+    
     orders = query.offset(skip).limit(limit).all()
 
     result = []
@@ -319,9 +320,15 @@ async def accept_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:
         return error_response(code=404, message="订单不存在")
diff --git a/jobs.sqlite b/jobs.sqlite
index b1b8d8fc34a1f665a3f1a0585f2574f7bf31f7a0..273a0d9685abf8778eb355c5bcd7e57b558ee50d 100644
GIT binary patch
delta 19
acmZoTz}Rqrae_3X??f4AM&FGI3*rGp>jugI

delta 19
acmZoTz}Rqrae_3X=R_H2M$e523*rGpuLi;Z