Sfoglia il codice sorgente

feat: add admin endpoint and service method to permanently delete orders and related data

jerry 1 mese fa
parent
commit
4ca1e696eb

+ 11 - 0
app/api/endpoints/order.py

@@ -166,6 +166,17 @@ async def vas_order_cancel(
     return success(data=cancelled_order)
     return success(data=cancelled_order)
 
 
 
 
+@admin_required_router.delete("/vas/order/delete", summary="管理员彻底删除订单及关联所有数据 (测试数据清理)", tags=["textskin"], response_model=ApiResponse[bool])
+@admin_required_router.post("/vas/order/delete", summary="管理员彻底删除订单及关联所有数据 (测试数据清理)", tags=["textskin"], response_model=ApiResponse[bool])
+async def vas_order_delete(
+    order_id: str = Query(..., description="要删除的订单ID"),
+    current_user: VasUser = Depends(get_current_user),
+    db: AsyncSession = Depends(get_db)
+):
+    await OrderService.delete_by_admin(db, order_id, current_user)
+    return success(data=True)
+
+
 @admin_required_router.post("/vas/order-event/create", summary="创建订单事件", tags=["textskin"], response_model=ApiResponse[VasOrderEventOut])
 @admin_required_router.post("/vas/order-event/create", summary="创建订单事件", tags=["textskin"], response_model=ApiResponse[VasOrderEventOut])
 async def vas_order_event_create(
 async def vas_order_event_create(
     event_data: VasOrderEventCreate,
     event_data: VasOrderEventCreate,

+ 70 - 1
app/services/order_service.py

@@ -6,7 +6,7 @@ from typing import List, Optional
 
 
 from redis.asyncio import Redis
 from redis.asyncio import Redis
 from sqlalchemy.ext.asyncio import AsyncSession
 from sqlalchemy.ext.asyncio import AsyncSession
-from sqlalchemy import select
+from sqlalchemy import select, delete, or_
 
 
 from app.core.logger import logger
 from app.core.logger import logger
 from app.utils.search import apply_keyword_search_stmt
 from app.utils.search import apply_keyword_search_stmt
@@ -17,6 +17,13 @@ from app.models.order import VasOrder
 from app.models.vas_task import VasTask
 from app.models.vas_task import VasTask
 from app.models.product import VasProduct
 from app.models.product import VasProduct
 from app.models.payment import VasPayment
 from app.models.payment import VasPayment
+from app.models.payment_confirmation import VasPaymentConfirmation
+from app.models.payment_event import VasPaymentEvent
+from app.models.order_event import VasOrderEvent
+from app.models.ticket import VasTicket
+from app.models.ticket_message import VasTicketMessage
+from app.models.fault import VasFaultCompensation
+from app.models.settlement import VasSettlementDetail
 from app.models.agency import VasAgency
 from app.models.agency import VasAgency
 from app.schemas.order import VasOrderCreate, VasOrderCreateAdmin, VasOrderAdjustPrice, VasOrderPatchUserInputs, VasOrderUpdate, VasOrderRegisterPayment
 from app.schemas.order import VasOrderCreate, VasOrderCreateAdmin, VasOrderAdjustPrice, VasOrderPatchUserInputs, VasOrderUpdate, VasOrderRegisterPayment
 from app.services.webhook_service import WebhookService
 from app.services.webhook_service import WebhookService
@@ -318,6 +325,68 @@ class OrderService:
         logger.info(f"🚫 [ORDER] Cancelled order: id={order.id} and its associated tasks")
         logger.info(f"🚫 [ORDER] Cancelled order: id={order.id} and its associated tasks")
         return order
         return order
 
 
+    @staticmethod
+    async def delete_by_admin(
+        db: AsyncSession,
+        order_id: str,
+        current_user: VasUser,
+    ) -> bool:
+        """
+        管理员彻底删除订单及关联的所有流水、任务、工单、事件与结算记录 (主要用于测试数据或异常数据清理)
+        """
+        stmt = select(VasOrder).where(VasOrder.id == order_id)
+        order = (await db.execute(stmt)).scalar_one_or_none()
+        if not order:
+            raise NotFoundError(f"Order not found: {order_id}")
+
+        # 1. 查找关联的支付流水记录 ID
+        p_stmt = select(VasPayment.id).where(VasPayment.order_id == order_id)
+        payment_ids = list((await db.execute(p_stmt)).scalars().all())
+
+        # 2. 查找关联的客户支持工单 ID
+        t_stmt = select(VasTicket.id).where(VasTicket.order_id == order_id)
+        ticket_ids = list((await db.execute(t_stmt)).scalars().all())
+
+        # 3. 删除工单沟通消息及工单主体
+        if ticket_ids:
+            await db.execute(delete(VasTicketMessage).where(VasTicketMessage.ticket_id.in_(ticket_ids)))
+            await db.execute(delete(VasTicket).where(VasTicket.id.in_(ticket_ids)))
+
+        # 4. 删除支付相关记录 (核销单、网关原始回调事件、支付流水)
+        if payment_ids:
+            await db.execute(delete(VasPaymentConfirmation).where(VasPaymentConfirmation.payment_id.in_(payment_ids)))
+            await db.execute(
+                delete(VasPaymentEvent).where(
+                    or_(
+                        VasPaymentEvent.matched_order_id == order_id,
+                        VasPaymentEvent.matched_payment_id.in_(payment_ids),
+                    )
+                )
+            )
+            await db.execute(delete(VasPayment).where(VasPayment.id.in_(payment_ids)))
+        else:
+            await db.execute(delete(VasPaymentEvent).where(VasPaymentEvent.matched_order_id == order_id))
+
+        # 5. 删除抓号/抢单自动化执行任务
+        await db.execute(delete(VasTask).where(VasTask.order_id == order_id))
+
+        # 6. 删除订单全生命周期流转事件日志
+        await db.execute(delete(VasOrderEvent).where(VasOrderEvent.order_no == order_id))
+
+        # 7. 删除财务结算分成与故障过失记录
+        await db.execute(delete(VasSettlementDetail).where(VasSettlementDetail.order_id == order_id))
+        await db.execute(delete(VasFaultCompensation).where(VasFaultCompensation.order_id == order_id))
+
+        # 8. 删除主订单记录
+        await db.delete(order)
+
+        await db.commit()
+        logger.warning(
+            f"🗑️ [ORDER DELETE] Admin {current_user.id} permanently deleted order {order_id} "
+            f"(associated payments: {len(payment_ids)}, tickets: {len(ticket_ids)})"
+        )
+        return True
+
     @staticmethod
     @staticmethod
     async def mark_completed(
     async def mark_completed(
         db: AsyncSession,
         db: AsyncSession,

+ 35 - 0
tests/test_admin_order_payment.py

@@ -119,3 +119,38 @@ class TestAdminOrderPayment(unittest.IsolatedAsyncioTestCase):
         self.assertEqual(added_payment.amount, 48000)
         self.assertEqual(added_payment.amount, 48000)
         self.assertEqual(added_payment.provider, "alipay")
         self.assertEqual(added_payment.provider, "alipay")
         self.assertEqual(added_payment.external_trade_no, "ALI998877")
         self.assertEqual(added_payment.external_trade_no, "ALI998877")
+
+    async def test_delete_by_admin_success(self):
+        db = AsyncMock()
+
+        existing_order = VasOrder(
+            id="ORD-2026-DEL-001",
+            user_id="U123",
+            product_id=1,
+            product_name="测试商品",
+            base_amount=50000,
+            final_amount=50000,
+            base_currency="CNY",
+            status="pending",
+        )
+
+        mock_res_order = MagicMock()
+        mock_res_order.scalar_one_or_none.return_value = existing_order
+
+        mock_res_payments = MagicMock()
+        mock_res_payments.scalars.return_value.all.return_value = [101, 102]
+
+        mock_res_tickets = MagicMock()
+        mock_res_tickets.scalars.return_value.all.return_value = [201]
+
+        db.execute.side_effect = [
+            mock_res_order,
+            mock_res_payments,
+            mock_res_tickets,
+            None, None, None, None, None, None, None, None, None
+        ]
+
+        result = await OrderService.delete_by_admin(db, "ORD-2026-DEL-001", self.admin)
+        self.assertTrue(result)
+        db.delete.assert_called_once_with(existing_order)
+        db.commit.assert_called_once()