|
|
@@ -150,9 +150,10 @@ export class TeamService {
|
|
|
const todayEnd = new Date()
|
|
|
todayEnd.setUTCHours(23, 59, 59, 999)
|
|
|
|
|
|
- // 获取所有团队的 userId 列表,并添加默认的 agentId 0
|
|
|
+ // 获取所有团队的 userId 列表
|
|
|
const teamUserIds = teams.map(team => team.userId)
|
|
|
- const allUserIds = [...teamUserIds, 0] // 添加默认的 agentId 0
|
|
|
+ // 只有在管理员查看时才添加默认的 agentId 0
|
|
|
+ const allUserIds = userId ? teamUserIds : [...teamUserIds, 0]
|
|
|
|
|
|
// 获取所有团队的 ID 列表,用于查询会员数据
|
|
|
const teamIds = teams.map(team => team.id)
|
|
|
@@ -330,34 +331,36 @@ export class TeamService {
|
|
|
})
|
|
|
})
|
|
|
|
|
|
- // 添加默认团队数据(agentId 为 0)
|
|
|
- const defaultTotalRevenue = totalRevenueMap.get(0) || 0
|
|
|
- const defaultTodayRevenue = todayRevenueMap.get(0) || 0
|
|
|
- const defaultTotalSales = totalSalesMap.get(0) || 0
|
|
|
- const defaultTodaySales = todaySalesMap.get(0) || 0
|
|
|
- const defaultTodayDAU = todayDAUMap.get(0) || 0
|
|
|
- const defaultTodayNewUsers = todayNewUsersMap.get(0) || 0
|
|
|
- const defaultTotalUsers = totalUsersMap.get(0) || 0
|
|
|
-
|
|
|
- statistics.totalRevenue += defaultTotalRevenue
|
|
|
- statistics.todayRevenue += defaultTodayRevenue
|
|
|
- statistics.totalSales += defaultTotalSales
|
|
|
- statistics.todaySales += defaultTodaySales
|
|
|
- statistics.todayDAU += defaultTodayDAU
|
|
|
- statistics.todayNewUsers += defaultTodayNewUsers
|
|
|
-
|
|
|
- // 将默认团队数据添加到列表最后
|
|
|
- statistics.allTeams.push({
|
|
|
- id: 0, // 使用 0 作为默认团队的 ID
|
|
|
- name: '默认',
|
|
|
- totalRevenue: Number(defaultTotalRevenue.toFixed(5)),
|
|
|
- todayRevenue: Number(defaultTodayRevenue.toFixed(5)),
|
|
|
- totalSales: Number(defaultTotalSales.toFixed(5)),
|
|
|
- todaySales: Number(defaultTodaySales.toFixed(5)),
|
|
|
- todayDAU: Number(defaultTodayDAU),
|
|
|
- todayNewUsers: Number(defaultTodayNewUsers),
|
|
|
- totalUsers: Number(defaultTotalUsers)
|
|
|
- })
|
|
|
+ // 只有在管理员查看时才添加默认团队数据(agentId 为 0)
|
|
|
+ if (!userId) {
|
|
|
+ const defaultTotalRevenue = totalRevenueMap.get(0) || 0
|
|
|
+ const defaultTodayRevenue = todayRevenueMap.get(0) || 0
|
|
|
+ const defaultTotalSales = totalSalesMap.get(0) || 0
|
|
|
+ const defaultTodaySales = todaySalesMap.get(0) || 0
|
|
|
+ const defaultTodayDAU = todayDAUMap.get(0) || 0
|
|
|
+ const defaultTodayNewUsers = todayNewUsersMap.get(0) || 0
|
|
|
+ const defaultTotalUsers = totalUsersMap.get(0) || 0
|
|
|
+
|
|
|
+ statistics.totalRevenue += defaultTotalRevenue
|
|
|
+ statistics.todayRevenue += defaultTodayRevenue
|
|
|
+ statistics.totalSales += defaultTotalSales
|
|
|
+ statistics.todaySales += defaultTodaySales
|
|
|
+ statistics.todayDAU += defaultTodayDAU
|
|
|
+ statistics.todayNewUsers += defaultTodayNewUsers
|
|
|
+
|
|
|
+ // 将默认团队数据添加到列表最后
|
|
|
+ statistics.allTeams.push({
|
|
|
+ id: 0, // 使用 0 作为默认团队的 ID
|
|
|
+ name: '默认',
|
|
|
+ totalRevenue: Number(defaultTotalRevenue.toFixed(5)),
|
|
|
+ todayRevenue: Number(defaultTodayRevenue.toFixed(5)),
|
|
|
+ totalSales: Number(defaultTotalSales.toFixed(5)),
|
|
|
+ todaySales: Number(defaultTodaySales.toFixed(5)),
|
|
|
+ todayDAU: Number(defaultTodayDAU),
|
|
|
+ todayNewUsers: Number(defaultTodayNewUsers),
|
|
|
+ totalUsers: Number(defaultTotalUsers)
|
|
|
+ })
|
|
|
+ }
|
|
|
|
|
|
statistics.averageCommissionRate = teams.length > 0 ? Number((totalCommissionRate / teams.length).toFixed(2)) : 0
|
|
|
|