Bläddra i källkod

fix: use coalesce to handle null sums in settlement stats and import or_ in order tools

jerry 1 månad sedan
förälder
incheckning
215a3fb39e

+ 1 - 1
app/services/agent/tools/builtin/order_tools.py

@@ -1,7 +1,7 @@
 # app/services/agent/tools/builtin/order_tools.py
 # app/services/agent/tools/builtin/order_tools.py
 from typing import Optional, Dict, Any, List
 from typing import Optional, Dict, Any, List
 from sqlalchemy.ext.asyncio import AsyncSession
 from sqlalchemy.ext.asyncio import AsyncSession
-from sqlalchemy import select, desc
+from sqlalchemy import select, desc, or_
 from app.models.order import VasOrder
 from app.models.order import VasOrder
 from app.models.user import VasUser
 from app.models.user import VasUser
 from app.services.order_service import OrderService
 from app.services.order_service import OrderService

+ 3 - 3
app/services/agent/tools/builtin/settlement_tools.py

@@ -2,7 +2,7 @@
 from datetime import datetime, timedelta
 from datetime import datetime, timedelta
 from typing import Optional, Dict, Any, List
 from typing import Optional, Dict, Any, List
 from sqlalchemy.ext.asyncio import AsyncSession
 from sqlalchemy.ext.asyncio import AsyncSession
-from sqlalchemy import select, func, desc
+from sqlalchemy import select, func, desc, case
 from app.models.user import VasUser
 from app.models.user import VasUser
 from app.models.order import VasOrder
 from app.models.order import VasOrder
 from app.models.payment import VasPayment
 from app.models.payment import VasPayment
@@ -52,8 +52,8 @@ async def get_financial_overview(
     # 订单总数与完成数
     # 订单总数与完成数
     order_stmt = select(
     order_stmt = select(
         func.count(VasOrder.id).label("total_orders"),
         func.count(VasOrder.id).label("total_orders"),
-        func.sum(func.case((VasOrder.status == 'completed', 1), else_=0)).label("completed_orders"),
-        func.sum(func.case((VasOrder.status == 'pending', 1), else_=0)).label("pending_orders"),
+        func.coalesce(func.sum(case((VasOrder.status == 'completed', 1), else_=0)), 0).label("completed_orders"),
+        func.coalesce(func.sum(case((VasOrder.status == 'pending', 1), else_=0)), 0).label("pending_orders"),
     )
     )
     order_res = await db.execute(order_stmt)
     order_res = await db.execute(order_stmt)
     total_orders, completed_orders, pending_orders = order_res.one()
     total_orders, completed_orders, pending_orders = order_res.one()