From a5fd2647e3276288cab5eb05e9c0bebe3f37b236 Mon Sep 17 00:00:00 2001
From: aaron <>
Date: Sat, 5 Apr 2025 21:23:42 +0800
Subject: [PATCH] update

---
 app/api/endpoints/order.py |  42 ++++++++++++++++++-------------------
 jobs.sqlite                | Bin 24576 -> 24576 bytes
 2 files changed, 21 insertions(+), 21 deletions(-)

diff --git a/app/api/endpoints/order.py b/app/api/endpoints/order.py
index ab7a3dd..abe023f 100644
--- a/app/api/endpoints/order.py
+++ b/app/api/endpoints/order.py
@@ -1632,7 +1632,7 @@ async def refund_order_amount(
 async def get_admin_orders(
     status: Optional[OrderStatus] = None,
     user_id: Optional[int] = None,
-    order_id: Optional[str] = None,
+    orderid: Optional[str] = None,
     skip: int = 0,
     limit: int = 20,
     db: Session = Depends(get_db),
@@ -1660,8 +1660,8 @@ async def get_admin_orders(
             query = query.filter(ShippingOrderDB.status == status)
         
         # 添加订单号过滤
-        if order_id:
-            query = query.filter(ShippingOrderDB.orderid == order_id)
+        if orderid:
+            query = query.filter(ShippingOrderDB.orderid == orderid)
         
         # 获取总数
         total = query.count()
@@ -1673,25 +1673,25 @@ async def get_admin_orders(
         
         orders = []
         for order in results:
-            # 查询订单包裹信息
-            packages = db.query(
-                ShippingOrderPackageDB
-            ).filter(
-                ShippingOrderPackageDB.orderid == order.orderid
-            ).all()
+            # # 查询订单包裹信息
+            # packages = db.query(
+            #     ShippingOrderPackageDB
+            # ).filter(
+            #     ShippingOrderPackageDB.orderid == order.orderid
+            # ).all()
             
-            # 格式化包裹信息
-            package_list = [{
-                "id": package.id,
-                "station_id": package.station_id,
-                "station_name": package.station_name,
-                "pickup_codes": package.pickup_codes
-            } for package in packages]
+            # # 格式化包裹信息
+            # package_list = [{
+            #     "id": package.id,
+            #     "station_id": package.station_id,
+            #     "station_name": package.station_name,
+            #     "pickup_codes": package.pickup_codes
+            # } for package in packages]
 
             # 查询子订单    
-            sub_orders = db.query(PointProductOrderDB).filter(
-                PointProductOrderDB.delivery_order_id == order.orderid
-            ).all()
+            # sub_orders = db.query(PointProductOrderDB).filter(
+            #     PointProductOrderDB.delivery_order_id == order.orderid
+            # ).all()
 
             item = {
                 "orderid": order.orderid,
@@ -1712,8 +1712,8 @@ async def get_admin_orders(
                 "refund_amount": order.refund_amount,
                 "refund_reason": order.refund_reason,
                 "refund_user_id": order.refund_user_id,
-                "packages": package_list,
-                "sub_orders": [PointProductOrderInfo.model_validate(sub_order) for sub_order in sub_orders],
+                # "packages": package_list,
+                # "sub_orders": [PointProductOrderInfo.model_validate(sub_order) for sub_order in sub_orders],
                 "address": {
                     "name": order.address_customer_name,
                     "phone": order.address_customer_phone,
diff --git a/jobs.sqlite b/jobs.sqlite
index 99f3d75a5ed2d573bfe2f32072f79084d7743948..4aa70454244d61dd608bbf228ebb0f19284564b4 100644
GIT binary patch
delta 19
bcmZoTz}Rqrae_4C#)&e{j2ky5EQkjHO2-G1

delta 19
bcmZoTz}Rqrae_4C(up$8j7v8rEQkjHN)rcq