提交

services/transferService.js

@@ -241,7 +241,7 @@ class TransferService {
     // 获取转账列表
     async getTransfers(filters = {}, pagination = {}, user_type = 'user_to_user') {
         const db = getDB();
-        const {page = 1, limit = 10, sort = 'created_at', order = 'desc'} = pagination;
+        const {page = 1, limit = 10, sort = 'id', order = 'desc'} = pagination;
         const pageNum = parseInt(page, 10) || 1;
         const limitNum = parseInt(limit, 10) || 10;
         const offset = (pageNum - 1) * limitNum;
@@ -283,7 +283,7 @@ class TransferService {
 
         // 构建排序子句
         const validSortFields = ['id', 'amount', 'created_at', 'updated_at', 'status'];
-        const sortField = validSortFields.includes(sort) ? sort : 'created_at';
+        const sortField = validSortFields.includes(sort) ? sort : 'id';
         const sortOrder = order && order.toLowerCase() === 'asc' ? 'ASC' : 'DESC';
 
         const orderClause = `ORDER BY t.${sortField} ${sortOrder}`;
@@ -304,6 +304,8 @@ class TransferService {
                 `SELECT t.*,
                         fu.username  as from_username,
                         fu.real_name as from_real_name,
+                        fu.balance as from_balance,
+                        tu.balance as to_balance,
                         tu.username  as to_username,
                         tu.real_name as to_real_name,
                         f_p.name as from_province,
@@ -322,7 +324,7 @@ class TransferService {
                           LEFT JOIN china_regions t_c ON t_c.code = tu.city
                           LEFT JOIN china_regions t_d ON t_d.code = tu.district_id
                      ${whereClause} ${orderClause}
-                 LIMIT ${limitNum}`,
+                 LIMIT ${limitNum} OFFSET ${offset}`,
                 params
             );