Merge branch 'main' of https://gitee.com/wg123/video-gen

video-gen-api/app/services/team_manager_service.py

@@ -129,11 +129,19 @@ async def transfer_credits_to_member(
     manager_id: str,
     target_member_id: str,
     amount: float,
+    direction: str = "increase",  # "increase" 管理人→成员; "decrease" 成员扣减
     description: str | None = None,
 ) -> None:
-    """管理人从自己余额转积分给团队成员。"""
+    """管理人为团队成员增加或扣减积分。
+
+    direction:
+      - "increase": 管理人从自己余额转积分给成员（管理人减少，成员增加）
+      - "decrease": 从成员扣积分回到管理人（成员减少，管理人增加）
+    """
     if amount <= 0:
-        raise HTTPException(status_code=400, description="转账积分必须大于0")
+        raise HTTPException(status_code=400, description="积分数量必须大于0")
+    if direction not in ("increase", "decrease"):
+        raise HTTPException(status_code=400, description="无效操作方向")
 
     # 获取管理人
     manager_result = await db.execute(
@@ -155,7 +163,7 @@ async def transfer_credits_to_member(
     if not manager.team_id:
         raise HTTPException(status_code=400, detail="您不在任何团队中")
     if member.team_id != manager.team_id:
-        raise HTTPException(status_code=400, detail="只能转账给同团队成员")
+        raise HTTPException(status_code=400, detail="只能操作同团队成员")
 
     team_result = await db.execute(
         select(Team).where(Team.id == manager.team_id, Team.deleted_at.is_(None)).limit(1)
@@ -164,22 +172,44 @@ async def transfer_credits_to_member(
     if not team or team.manager_id != manager_id:
         raise HTTPException(status_code=403, detail="只有团队管理人才能分配积分")
 
-    desc = description or "团队积分发放"
+    desc = description or ("团队积分发放" if direction == "increase" else "团队积分扣减")
+    xfer_id = generate_id()
 
-    # 从管理人扣减
-    await deduct_credits(
-        db,
-        manager_id,
-        amount,
-        f"分配给成员 {member.username}: {desc}",
-        biz_key=f"mgr_xfer_out:{manager_id}:{target_member_id}:{generate_id()}",
-    )
-    # 给成员增加
-    await add_credits(
-        db,
-        target_member_id,
-        amount,
-        f"来自团队管理人: {desc}",
-        record_type="admin",
-        biz_key=f"mgr_xfer_in:{manager_id}:{target_member_id}:{generate_id()}",
-    )
+    if direction == "increase":
+        # 管理人扣减
+        await deduct_credits(
+            db,
+            manager_id,
+            amount,
+            f"分配给成员 {member.username}: {desc}",
+            record_type="team_internal",
+            biz_key=f"mgr_xfer_out:{manager_id}:{target_member_id}:{xfer_id}",
+        )
+        # 成员增加
+        await add_credits(
+            db,
+            target_member_id,
+            amount,
+            f"来自团队管理人: {desc}",
+            record_type="team_internal",
+            biz_key=f"mgr_xfer_in:{manager_id}:{target_member_id}:{xfer_id}",
+        )
+    else:
+        # 成员扣减
+        await deduct_credits(
+            db,
+            target_member_id,
+            amount,
+            f"扣减给团队管理人: {desc}",
+            record_type="team_internal",
+            biz_key=f"mgr_deduct_out:{manager_id}:{target_member_id}:{xfer_id}",
+        )
+        # 管理人增加
+        await add_credits(
+            db,
+            manager_id,
+            amount,
+            f"来自成员 {member.username}: {desc}",
+            record_type="team_internal",
+            biz_key=f"mgr_deduct_in:{manager_id}:{target_member_id}:{xfer_id}",
+        )