增加更多详细交易数据

database_sql.py

@@ -153,6 +153,10 @@ def _auto_migrate_p7_fields():
                     'withdraw_status': 'VARCHAR',
                     'payment_order_id': 'VARCHAR',
                     'net_amount': 'INTEGER',
+                    'description': 'VARCHAR',
+                    'item_title': 'VARCHAR',
+                    'item_type': 'VARCHAR',
+                    'related_user_name': 'VARCHAR',
                 }
                 
                 for col_name, col_type in new_columns.items():

models_sql.py

@@ -75,6 +75,12 @@ class Transaction(Base):
     payment_order_id = Column(String, nullable=True)     # 管理员填写的打款订单号
     net_amount = Column(Integer, nullable=True)          # 实际到账金额（用于解冻时准确扣减）
     
+    # 交易详情增强字段
+    description = Column(String, nullable=True)          # 交易自描述文本
+    item_title = Column(String, nullable=True)           # 资源/任务标题
+    item_type = Column(String, nullable=True)            # 资源类型 (tool/app/recommend/post/task)
+    related_user_name = Column(String, nullable=True)    # 对方用户名
+    
     # 🚀 P1性能优化：复合索引
     __table_args__ = (
         Index('ix_transactions_account_type', 'account', 'tx_type'),

router_tasks.py

@@ -37,7 +37,9 @@ def calculate_tx_hash(tx_id, account, tx_type, amount, prev_hash):
     data = f"{tx_id}{account}{tx_type}{amount}{prev_hash}"
     return hashlib.sha256(data.encode()).hexdigest()
 
-def create_task_transaction(db_session: Session, account: str, tx_type: str, amount: int, related_account: str = None, task_id: str = None):
+def create_task_transaction(db_session: Session, account: str, tx_type: str, amount: int, 
+                          related_account: str = None, task_id: str = None,
+                          task_title: str = None, related_user_name: str = None):
     """
     创建任务相关交易记录
     tx_type: TASK_FREEZE, TASK_DEPOSIT, TASK_PAYMENT, TASK_INCOME, TASK_REFUND
@@ -48,6 +50,18 @@ def create_task_transaction(db_session: Session, account: str, tx_type: str, amo
     prev_hash = last_tx.tx_hash if last_tx else "GENESIS_HASH"
     tx_hash = calculate_tx_hash(tx_id, account, tx_type, amount, prev_hash)
     
+    # 根据 tx_type 构造 description
+    type_labels = {
+        "TASK_FREEZE": "任务冻结",
+        "TASK_DEPOSIT": "任务订金",
+        "TASK_PAYMENT": "任务尾款",
+        "TASK_INCOME": "任务收入",
+        "TASK_REFUND": "任务退款",
+        "TASK_CANCEL_REFUND": "任务取消退款",
+    }
+    label = type_labels.get(tx_type, tx_type)
+    desc = f"{label}: {task_title}" if task_title else label
+    
     new_tx = Transaction(
         tx_id=tx_id,
         account=account,
@@ -56,7 +70,11 @@ def create_task_transaction(db_session: Session, account: str, tx_type: str, amo
         related_account=related_account,
         item_id=task_id,  # 复用 item_id 字段存储任务ID
         prev_hash=prev_hash,
-        tx_hash=tx_hash
+        tx_hash=tx_hash,
+        description=desc,
+        item_title=task_title,
+        item_type="task",
+        related_user_name=related_user_name
     )
     db_session.add(new_tx)
     
@@ -152,7 +170,8 @@ def check_and_update_expired_tasks(tasks_db, db_session=None):
                     # 记录退款交易
                     create_task_transaction(
                         db_session, item["publisher"], "TASK_REFUND",
-                        item["amount"], task_id=item["task_id"]
+                        item["amount"], task_id=item["task_id"],
+                        task_title=item["title"]
                     )
                     
                     refund_results.append(item)
@@ -411,7 +430,8 @@ async def create_task(task: TaskCreate, current_user: str = Depends(require_auth
     # 💳 记录冻结交易
     create_task_transaction(
         db_session, current_user, "TASK_FREEZE", 
-        -task.totalPrice, task_id=task_id
+        -task.totalPrice, task_id=task_id,
+        task_title=task.title
     )
     db_session.commit()
     
@@ -518,7 +538,8 @@ async def cancel_task(task_id: str, current_user: str = Depends(require_auth), d
                         # 记录退款交易
                         create_task_transaction(
                             db_session, current_user, "TASK_CANCEL_REFUND",
-                            frozen_amount, task_id=task_id
+                            frozen_amount, task_id=task_id,
+                            task_title=task.get("title")
                         )
                         db_session.commit()
                         refund_success = True
@@ -654,10 +675,17 @@ async def assign_task(task_id: str, assignee: str, current_user: str = Depends(r
             # 订金从冻结金额中扣除（但还不给接单者，待任务完成后一起支付）
             wallet.frozen_balance -= deposit
             
+            # 获取接单者用户名
+            users_db = db.load_data("users.json", default_data={})
+            assignee_info = users_db.get(assignee, {})
+            assignee_name = assignee_info.get("name", assignee)
+            
             # 💳 记录订金支付交易
             create_task_transaction(
                 db_session, current_user, "TASK_DEPOSIT",
-                -deposit, related_account=assignee, task_id=task_id
+                -deposit, related_account=assignee, task_id=task_id,
+                task_title=task.get("title"),
+                related_user_name=assignee_name
             )
             
             # 更新任务状态
@@ -779,16 +807,27 @@ async def accept_task(task_id: str, is_accepted: bool, feedback: str = None, cur
                     
                     assignee_wallet.balance += total_price  # 全款进入可用余额
                     
+                    # 获取双方用户名
+                    users_db = db.load_data("users.json", default_data={})
+                    publisher_info = users_db.get(current_user, {})
+                    assignee_info = users_db.get(assignee_account, {})
+                    publisher_name = publisher_info.get("name", current_user)
+                    assignee_name = assignee_info.get("name", assignee_account)
+                    
                     # 💳 记录交易流水
                     # 1. 发布者支付尾款
                     create_task_transaction(
                         db_session, current_user, "TASK_PAYMENT",
-                        -remaining, related_account=assignee_account, task_id=task_id
+                        -remaining, related_account=assignee_account, task_id=task_id,
+                        task_title=task.get("title"),
+                        related_user_name=assignee_name
                     )
                     # 2. 接单者收入
                     create_task_transaction(
                         db_session, assignee_account, "TASK_INCOME",
-                        total_price, related_account=current_user, task_id=task_id
+                        total_price, related_account=current_user, task_id=task_id,
+                        task_title=task.get("title"),
+                        related_user_name=publisher_name
                     )
                     
                     task["status"] = "completed"

router_wallet.py

@@ -161,7 +161,8 @@ async def alipay_notify(request: Request, db: Session = Depends(get_db)):
                 
                 new_tx = Transaction(
                     tx_id=order_id, account=account, tx_type="RECHARGE", amount=amount,
-                    prev_hash=prev_hash, tx_hash=tx_hash
+                    prev_hash=prev_hash, tx_hash=tx_hash,
+                    description="支付宝充值"
                 )
                 db.add(new_tx)
                 db.commit()
@@ -210,7 +211,8 @@ async def check_order(order_id: str, account: str = None, db: Session = Depends(
 
                 new_tx = Transaction(
                     tx_id=order_id, account=account, tx_type="RECHARGE", amount=amount,
-                    prev_hash=prev_hash, tx_hash=tx_hash
+                    prev_hash=prev_hash, tx_hash=tx_hash,
+                    description="支付宝充值"
                 )
                 db.add(new_tx)
                 db.commit()
@@ -330,10 +332,19 @@ async def purchase_item(request: Request, req: PurchaseRequest, db: Session = De
         prev_hash = last_tx.tx_hash if last_tx else "GENESIS_HASH"
         tx_hash = calculate_tx_hash(tx_id, req.account, "PURCHASE", -price, prev_hash)
         
+        # 获取卖家用户名
+        users_db = json_db.load_data("users.json", default_data={})
+        seller_info = users_db.get(seller_account, {})
+        seller_user_name = seller_info.get("name", seller_account)
+        
         # 创建交易记录 (字段名为 related_account，与 models_sql.py 中 Transaction 模型保持一致)
         new_tx = Transaction(
             tx_id=tx_id, account=req.account, tx_type="PURCHASE", amount=-price,
-            related_account=seller_account, item_id=req.item_id, prev_hash=prev_hash, tx_hash=tx_hash
+            related_account=seller_account, item_id=req.item_id, prev_hash=prev_hash, tx_hash=tx_hash,
+            description=f"购买 {item.get('title', '未知资源')}",
+            item_title=item.get('title', ''),
+            item_type=item.get('type', ''),
+            related_user_name=seller_user_name
         )
         db.add(new_tx)
         db.commit()
@@ -397,15 +408,44 @@ async def tip_user(request: Request, req: TipRequest, db: Session = Depends(get_
         prev_hash_sender = last_tx_sender.tx_hash if last_tx_sender else "GENESIS_HASH"
         prev_hash_target = last_tx_target.tx_hash if last_tx_target else "GENESIS_HASH"
         
+        # 获取用户名和资源信息
+        users_db = json_db.load_data("users.json", default_data={})
+        target_user_info = users_db.get(req.target_account, {})
+        sender_user_info = users_db.get(req.sender_account, {})
+        target_user_name = target_user_info.get("name", req.target_account)
+        sender_user_name = sender_user_info.get("name", req.sender_account)
+        
+        # 如果有关联资源，获取资源信息
+        item_title = None
+        item_type = None
+        if req.item_id:
+            items_db = json_db.load_data("items.json", default_data=[])
+            item = next((i for i in items_db if i["id"] == req.item_id), None)
+            if item:
+                item_title = item.get("title")
+                item_type = item.get("type")
+        
         # 发送方交易记录 (字段名为 related_account，与 models_sql.py 中 Transaction 模型保持一致)
-        tx_sender = Transaction(tx_id=tx_id_sender, account=req.sender_account, tx_type="TIP_OUT", amount=-req.amount,
-                                related_account=req.target_account, prev_hash=prev_hash_sender,
-                                tx_hash=calculate_tx_hash(tx_id_sender, req.sender_account, "TIP_OUT", -req.amount, prev_hash_sender))
+        tx_sender = Transaction(
+            tx_id=tx_id_sender, account=req.sender_account, tx_type="TIP_OUT", amount=-req.amount,
+            related_account=req.target_account, prev_hash=prev_hash_sender,
+            tx_hash=calculate_tx_hash(tx_id_sender, req.sender_account, "TIP_OUT", -req.amount, prev_hash_sender),
+            description=f"打赏给 {target_user_name}" + (f" 的 {item_title}" if item_title else ""),
+            item_title=item_title,
+            item_type=item_type,
+            related_user_name=target_user_name
+        )
         
         # 接收方交易记录
-        tx_target = Transaction(tx_id=tx_id_target, account=req.target_account, tx_type="TIP_IN", amount=req.amount,
-                                related_account=req.sender_account, prev_hash=prev_hash_target,
-                                tx_hash=calculate_tx_hash(tx_id_target, req.target_account, "TIP_IN", req.amount, prev_hash_target))
+        tx_target = Transaction(
+            tx_id=tx_id_target, account=req.target_account, tx_type="TIP_IN", amount=req.amount,
+            related_account=req.sender_account, prev_hash=prev_hash_target,
+            tx_hash=calculate_tx_hash(tx_id_target, req.target_account, "TIP_IN", req.amount, prev_hash_target),
+            description=f"收到 {sender_user_name} 的打赏" + (f" ({item_title})" if item_title else ""),
+            item_title=item_title,
+            item_type=item_type,
+            related_user_name=sender_user_name if not req.is_anonymous else "匿名用户"
+        )
                                 
         db.add(tx_sender)
         db.add(tx_target)
@@ -536,13 +576,18 @@ async def withdraw(request: Request, req: WithdrawRequest, db: Session = Depends
         prev_hash = last_tx.tx_hash if last_tx else "GENESIS_HASH"
         tx_hash = calculate_tx_hash(tx_id, req.account, "WITHDRAW", -actual_withdraw, prev_hash)
         
+        # 脱敏支付宝账号和姓名
+        masked_alipay = req.alipayAccount[:3] + "****" + req.alipayAccount[-4:] if len(req.alipayAccount) > 7 else req.alipayAccount
+        masked_name = req.real_name[0] + "*" * (len(req.real_name) - 1) if req.real_name else ""
+        
         new_tx = Transaction(
             tx_id=tx_id, account=req.account, tx_type="WITHDRAW", amount=-actual_withdraw,
             alipay_account=req.alipayAccount,
             real_name=req.real_name,
             withdraw_status="pending",
             net_amount=net_amount,  # 记录实际到账金额，用于解冻时准确扣减
-            prev_hash=prev_hash, tx_hash=tx_hash
+            prev_hash=prev_hash, tx_hash=tx_hash,
+            description=f"提现到支付宝 {masked_alipay} ({masked_name})"
         )
         db.add(new_tx)
         
@@ -552,7 +597,8 @@ async def withdraw(request: Request, req: WithdrawRequest, db: Session = Depends
             fee_tx_hash = calculate_tx_hash(fee_tx_id, req.account, "WITHDRAW_FEE", -fee_amount, tx_hash)
             fee_tx = Transaction(
                 tx_id=fee_tx_id, account=req.account, tx_type="WITHDRAW_FEE", amount=-fee_amount,
-                prev_hash=tx_hash, tx_hash=fee_tx_hash
+                prev_hash=tx_hash, tx_hash=fee_tx_hash,
+                description="提现手续费"
             )
             db.add(fee_tx)
         
@@ -604,14 +650,32 @@ async def get_transactions(
     # 格式化输出
     tx_list = []
     for tx in transactions:
-        tx_list.append({
+        tx_data = {
             "tx_id": tx.tx_id,
             "tx_type": tx.tx_type,
             "amount": tx.amount,
             "related_account": tx.related_account,
             "item_id": tx.item_id,
-            "created_at": tx.created_at.isoformat() if tx.created_at else None
-        })
+            "created_at": tx.created_at.isoformat() if tx.created_at else None,
+            # 新增字段
+            "description": tx.description,
+            "item_title": tx.item_title,
+            "item_type": tx.item_type,
+            "related_user_name": tx.related_user_name,
+        }
+        
+        # 提现类型额外返回脱敏信息
+        if tx.tx_type == "WITHDRAW":
+            # 脱敏支付宝账号
+            if tx.alipay_account:
+                a = tx.alipay_account
+                tx_data["alipay_account"] = a[:3] + "****" + a[-4:] if len(a) > 7 else a
+            if tx.real_name:
+                tx_data["real_name"] = tx.real_name[0] + "*" * (len(tx.real_name) - 1)
+            tx_data["withdraw_status"] = tx.withdraw_status
+            tx_data["net_amount"] = tx.net_amount
+        
+        tx_list.append(tx_data)
     
     return {
         "status": "success",
@@ -828,6 +892,11 @@ async def refund_purchase(request: Request, account: str, item_id: str, db: Sess
         )
         db.add(new_refund)
         
+        # 获取卖家用户名
+        users_db = json_db.load_data("users.json", default_data={})
+        seller_info = users_db.get(seller_account, {})
+        seller_user_name = seller_info.get("name", seller_account)
+        
         # 记录退款交易
         tx_id = f"REFUND_{int(time.time())}_{uuid.uuid4().hex[:6]}"
         last_tx = db.query(Transaction).filter(Transaction.account == account).order_by(Transaction.created_at.desc()).first()
@@ -836,7 +905,11 @@ async def refund_purchase(request: Request, account: str, item_id: str, db: Sess
         
         new_tx = Transaction(
             tx_id=tx_id, account=account, tx_type="REFUND", amount=refund_amount,
-            related_account=seller_account, item_id=item_id, prev_hash=prev_hash, tx_hash=tx_hash
+            related_account=seller_account, item_id=item_id, prev_hash=prev_hash, tx_hash=tx_hash,
+            description=f"退款: {item.get('title', '未知资源')}",
+            item_title=item.get('title', ''),
+            item_type=item.get('type', ''),
+            related_user_name=seller_user_name
         )
         db.add(new_tx)
         db.commit()
@@ -938,4 +1011,7 @@ async def complete_withdrawal(
     
     db.commit()
     
+    # 📝 P2优化：提现完成审计日志
+    logger.info(f"WITHDRAW_COMPLETED | admin={current_user} | tx_id={tx_id} | account={tx.account} | amount={tx.amount} | net_amount={tx.net_amount} | order_id={req.payment_order_id}")
+    
     return {"status": "success", "message": f"提现 {tx_id} 已确认打款完成"}