Browse Source

fix: 不展示和计数hidden状态的货源

Boss3
Default User 2 months ago
parent
commit
ea34f93882
  1. 7
      Management.html
  2. 14
      Reject.js

7
Management.html

@ -1019,12 +1019,15 @@
function renderSupplies(supplies) {
suppliesGrid.innerHTML = '';
if (supplies.length === 0) {
// 过滤掉hidden状态的货源
const filteredSupplies = supplies.filter(supply => supply.status !== 'hidden');
if (filteredSupplies.length === 0) {
suppliesGrid.innerHTML = '<p style="text-align: center; color: #666; grid-column: 1 / -1;">暂无货源数据</p>';
return;
}
supplies.forEach(supply => {
filteredSupplies.forEach(supply => {
const card = document.createElement('div');
card.className = 'supply-card';
card.style.cssText = 'border: 1px solid #e8e8e8; border-radius: 8px; padding: 15px; transition: all 0.3s;';

14
Reject.js

@ -1714,26 +1714,26 @@ app.get('/api/admin/stats/supplies', async (req, res) => {
}
}
// 获取每个卖家创建的货源数量,关联users表获取nickName
// 获取每个卖家创建的货源数量,关联users表获取nickName,过滤掉hidden状态的货源
// 替换created_at为p.created_at,避免歧义
const chartTimeCondition = timeCondition.replace(/created_at/g, 'p.created_at');
const [chartData] = await connection.query(`
SELECT p.sellerId, u.nickName, COUNT(*) as count
FROM products p
LEFT JOIN users u ON p.sellerId = u.userId
WHERE 1=1 ${chartTimeCondition}
WHERE 1=1 AND p.status != 'hidden' ${chartTimeCondition}
GROUP BY p.sellerId, u.nickName
ORDER BY count DESC
`);
// 获取总体统计信息
// 获取总体统计信息,过滤掉hidden状态的货源
const [totalSuppliesResult] = await connection.query(`
SELECT COUNT(*) as total FROM products WHERE 1=1 ${timeCondition}
SELECT COUNT(*) as total FROM products WHERE 1=1 AND status != 'hidden' ${timeCondition}
`);
const totalSupplies = totalSuppliesResult[0].total;
const [totalUsersResult] = await connection.query(`
SELECT COUNT(DISTINCT sellerId) as total FROM products WHERE 1=1 ${timeCondition}
SELECT COUNT(DISTINCT sellerId) as total FROM products WHERE 1=1 AND status != 'hidden' ${timeCondition}
`);
const totalUsers = totalUsersResult[0].total;
@ -1805,14 +1805,14 @@ app.get('/api/admin/supplies', async (req, res) => {
}
}
// 获取指定卖家的货源列表,关联users表获取创建人姓名
// 获取指定卖家的货源列表,关联users表获取创建人姓名,过滤掉hidden状态的货源
// 替换created_at为p.created_at,避免歧义
const suppliesTimeCondition = timeCondition.replace(/created_at/g, 'p.created_at');
const [supplies] = await connection.query(`
SELECT p.*, u.nickName
FROM products p
LEFT JOIN users u ON p.sellerId = u.userId
WHERE p.sellerId = ? ${suppliesTimeCondition}
WHERE p.sellerId = ? AND p.status != 'hidden' ${suppliesTimeCondition}
ORDER BY p.created_at DESC
`, [sellerId]);

Loading…
Cancel
Save