From 4115793c4ac884d814b071b091914f65622e46ce Mon Sep 17 00:00:00 2001
From: aaron <>
Date: Sun, 23 Mar 2025 20:19:19 +0800
Subject: [PATCH] update

---
 app/api/endpoints/merchant_order.py |  28 +++++++++++++++++++++++-----
 jobs.sqlite                         | Bin 24576 -> 24576 bytes
 2 files changed, 23 insertions(+), 5 deletions(-)

diff --git a/app/api/endpoints/merchant_order.py b/app/api/endpoints/merchant_order.py
index cdd6028..ddc0b3b 100644
--- a/app/api/endpoints/merchant_order.py
+++ b/app/api/endpoints/merchant_order.py
@@ -121,17 +121,35 @@ async def create_merchant_order(
 async def get_merchant_orders(
     skip: int = 0,
     limit: int = 100,
-    delivery_type: DeliveryType = None,
-    delivery_time_type: DeliveryTimeType = None,
+    delivery_type: Optional[DeliveryType] = None,
+    delivery_time_type: Optional[DeliveryTimeType] = None,
+    status: Optional[MerchantOrderStatus] = None,
     db: Session = Depends(get_db),
     merchant_user: UserDB = Depends(get_merchant_user)
 ):  
     """获取商家订单列表"""
-    orders = db.query(MerchantOrderDB).filter(
+    query = db.query(MerchantOrderDB).filter(
         MerchantOrderDB.merchant_id == merchant_user.userid
     ).order_by(
         MerchantOrderDB.create_time.desc()
-    ).offset(skip).limit(limit).all()
+    )
+
+    if delivery_type:
+        query = query.filter(
+            MerchantOrderDB.product_delivery_type == delivery_type
+        )
+
+    if delivery_time_type:
+        query = query.filter(
+            MerchantOrderDB.product_delivery_time_type == delivery_time_type
+        )
+
+    if status:
+        query = query.filter(
+            MerchantOrderDB.status == status
+        )
+
+    orders = query.offset(skip).limit(limit).all()
 
     result = []
     for order in orders:
@@ -180,7 +198,7 @@ async def get_user_orders(
 
     return success_response(data=result)
 
-@router.put("/{order_id}/cancel", response_model=ResponseModel)
+@router.put("/{order_id}/user/cancel", response_model=ResponseModel)
 async def cancel_order(
     order_id: str,
     db: Session = Depends(get_db),
diff --git a/jobs.sqlite b/jobs.sqlite
index 893bb48df03ee8eeb8da6b954180111b624d68f7..5ec58a82f84c260c28700e2f7371afc284097e85 100644
GIT binary patch
delta 21
bcmZoTz}Rqrae@>RJL^OlCm^{oVL?0qNP`AQ

delta 21
bcmZoTz}Rqrae@>R+uw;YPC#;F!h(1JSMdlo