admin/jurong_circle_agent_black
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

修bug

Browse Source
This commit is contained in:
dzl
2025-10-23 14:17:45 +08:00
parent 59f42d021f
commit f246f8c6ea
2 changed files with 23 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
logs/combined.log
View File

@@ -2205,3 +2205,10 @@
{"duration":"3ms","ip":"::ffff:192.168.1.124","level":"info","message":"HTTP Request","method":"GET","service":"integrated-system","statusCode":404,"timestamp":"2025-09-17 11:57:38","url":"/api/agents/commissions/stats?type=&status=","userAgent":"Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/92.0.4515.131 Safari/537.36 Edg/92.0.902.67"}
{"agentId":7,"ip":"::ffff:192.168.1.124","level":"info","message":"代理登录成功","phone":"15168182180","service":"integrated-system","timestamp":"2025-09-17 13:38:52"}
{"agentId":4,"ip":"::ffff:192.168.1.124","level":"info","message":"代理登录成功","phone":"15867461617","service":"integrated-system","timestamp":"2025-09-17 14:17:59"}
{"duration":"379ms","ip":"::ffff:192.168.0.11","level":"info","message":"HTTP Request","method":"GET","service":"integrated-system","statusCode":500,"timestamp":"2025-10-23 14:05:20","url":"/api/agent/stats_agent_directly","userAgent":"Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/92.0.4515.131 Safari/537.36 Edg/92.0.902.67"}
{"duration":"289ms","ip":"::ffff:192.168.0.11","level":"info","message":"HTTP Request","method":"GET","service":"integrated-system","statusCode":500,"timestamp":"2025-10-23 14:05:23","url":"/api/agent/stats_agent_directly","userAgent":"Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/92.0.4515.131 Safari/537.36 Edg/92.0.902.67"}
{"duration":"439ms","ip":"::ffff:192.168.0.11","level":"info","message":"HTTP Request","method":"GET","service":"integrated-system","statusCode":500,"timestamp":"2025-10-23 14:06:03","url":"/api/agent/stats_agent_directly","userAgent":"Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/92.0.4515.131 Safari/537.36 Edg/92.0.902.67"}
{"duration":"449ms","ip":"::ffff:192.168.0.11","level":"info","message":"HTTP Request","method":"GET","service":"integrated-system","statusCode":500,"timestamp":"2025-10-23 14:07:07","url":"/api/agent/stats_agent_directly","userAgent":"Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/92.0.4515.131 Safari/537.36 Edg/92.0.902.67"}
{"duration":"466ms","ip":"::ffff:192.168.0.11","level":"info","message":"HTTP Request","method":"GET","service":"integrated-system","statusCode":500,"timestamp":"2025-10-23 14:08:43","url":"/api/agent/stats_agent_directly","userAgent":"Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/92.0.4515.131 Safari/537.36 Edg/92.0.902.67"}
{"duration":"502ms","ip":"::ffff:192.168.0.11","level":"info","message":"HTTP Request","method":"GET","service":"integrated-system","statusCode":500,"timestamp":"2025-10-23 14:14:05","url":"/api/agent/stats_agent_directly","userAgent":"Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/92.0.4515.131 Safari/537.36 Edg/92.0.902.67"}
{"duration":"504ms","ip":"::ffff:192.168.0.11","level":"info","message":"HTTP Request","method":"GET","service":"integrated-system","statusCode":500,"timestamp":"2025-10-23 14:14:43","url":"/api/agent/stats_agent_directly","userAgent":"Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/92.0.4515.131 Safari/537.36 Edg/92.0.902.67"}

18
routes/agent.js
View File

@@ -187,7 +187,12 @@ router.get('/stats_agent_directly', agentAuth, async (req, res) => {
AND transfer_type = 'user_to_agent'
`, [userId]);
// 获取直营佣金
let [operated_commission] = await getDB().execute(`
let [operated_commission] = operated_commission_sql.length === 0 ?
await getDB().execute(`
SELECT SUM(amount) as amount FROM transfers
`)
:
await getDB().execute(`
SELECT SUM(amount) as amount FROM transfers WHERE ${operated_commission_sql.join(' or ')}
`)
@@ -199,7 +204,15 @@ router.get('/stats_agent_directly', agentAuth, async (req, res) => {
commissionStats[0].directly_agents_income = directly_agents_income[0].amount || 0
// 获取直销商户分享利润
let [active_users_income] = await getDB().execute(`
let [active_users_income] = operated_user_sql.length === 0 ?
await getDB().execute(`
SELECT SUM(amount) as amount
FROM transfers
WHERE transfer_type = 'user_to_agent'
AND source_type = 'agent_operated'
`,[...operated_user_ids])
:
await getDB().execute(`
SELECT SUM(amount) as amount
FROM transfers
WHERE (${operated_user_sql.join(' or ')})
@@ -268,6 +281,7 @@ router.get('/stats_agent_directly', agentAuth, async (req, res) => {
});
} catch (error) {
console.log('获取统计数据失败',error)
res.status(500).json({
success: false,
message: '获取统计数据失败'