update

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),