fix: apply quota point conversion

This commit is contained in:
Alex committed 2026-11-09 09:56:06 +08:00
1 parent 2553e482a9
commit ad66ae5f10
12 files changed
+205 -25

No files matched your search

+1 -1
View File
@@ -20,6 +20,6 @@
</section>
<div id="toast" class="toast"></div>
<div id="modal" class="modal hidden"><div class="modal-backdrop" data-close></div><div class="modal-card"><button class="modal-close" data-close>×</button><div id="modalContent"></div></div></div>
<script src="/assets/admin.js?v=20261102-scanqr" defer></script>
<script src="/assets/admin.js?v=20261109-quota-map" defer></script>
</body>
</html>
+1 -1
View File
@@ -33,7 +33,7 @@ function openRefund(order,search=''){
openModal();
}
function wireFilters(fn){$('#filters').onsubmit=e=>{e.preventDefault();fn(new URLSearchParams(new FormData(e.target)).toString())}}
async function renderUsers(search=''){const d=await api(`/api/admin/users?search=${encodeURIComponent(search)}`);$('#content').innerHTML=`<div class="section-lead"><div><h2>用户管理</h2><p>数据来源:PostgreSQL users 表;支付确认后由服务端自动增加 quota 积分。</p></div></div><form id="userSearch" class="filter-bar"><label>用户 ID 或用户名<input name="search" value="${esc(search)}" placeholder="输入关键词"></label><button class="secondary-btn">查询</button></form><section class="panel"><div class="table-wrap"><table><thead><tr><th>用户 ID</th><th>用户名</th><th>可用积分</th><th>累计已使用</th><th>成功充值</th><th>累计金额</th><th>同步时间</th></tr></thead><tbody>${d.rows.length?d.rows.map(u=>`<tr><td><code>${esc(u.id)}</code></td><td><b>${esc(u.username||u.display_name)}</b></td><td class="points-cell">${Number(u.quota||0).toLocaleString('zh-CN')}</td><td class="points-cell">${Number(u.used_quota||0).toLocaleString('zh-CN')}</td><td>${u.paid_orders||0} 笔</td><td>${fmtMoney(u.paid_cents)}</td><td>${fmtTime(u.updated_at)}</td></tr>`).join(''):empty(7)}</tbody></table></div></section>`;$('#userSearch').onsubmit=e=>{e.preventDefault();renderUsers(new FormData(e.target).get('search')||'')}}
async function renderUsers(search=''){const d=await api(`/api/admin/users?search=${encodeURIComponent(search)}`);$('#content').innerHTML=`<div class="section-lead"><div><h2>用户管理</h2><p>数据来源:PostgreSQL users 表;每 1 积分对应 5000 quota。</p></div></div><form id="userSearch" class="filter-bar"><label>用户 ID 或用户名<input name="search" value="${esc(search)}" placeholder="输入关键词"></label><button class="secondary-btn">查询</button></form><section class="panel"><div class="table-wrap"><table><thead><tr><th>用户 ID</th><th>用户名</th><th>可用积分</th><th>累计已使用</th><th>成功充值</th><th>累计金额</th><th>同步时间</th></tr></thead><tbody>${d.rows.length?d.rows.map(u=>`<tr><td><code>${esc(u.id)}</code></td><td><b>${esc(u.username||u.display_name)}</b></td><td class="points-cell">${Number(u.points_balance||0).toLocaleString('zh-CN')}</td><td class="points-cell">${Number(u.used_points||0).toLocaleString('zh-CN')}</td><td>${u.paid_orders||0} 笔</td><td>${fmtMoney(u.paid_cents)}</td><td>${fmtTime(u.updated_at)}</td></tr>`).join(''):empty(7)}</tbody></table></div></section>`;$('#userSearch').onsubmit=e=>{e.preventDefault();renderUsers(new FormData(e.target).get('search')||'')}}
function openUser(user={}){const isNew=!user.id;$('#modalContent').innerHTML=`<span class="eyebrow">${isNew?'新增':'编辑'}用户</span><h2>用户资料</h2><form id="userForm" class="settings-form"><label class="field">用户 ID<input name="id" value="${esc(user.id||'')}" ${isNew?'':'readonly'} placeholder="业务系统中的唯一 ID" required></label><label class="field">显示名称<input name="display_name" value="${esc(user.display_name||'')}" required></label><label class="field">积分余额<input name="points_balance" type="number" min="0" step="1" value="${Number(user.points_balance||0)}"></label><label class="toggle-field"><input name="enabled" type="checkbox" ${isNew||user.enabled?'checked':''}><span></span>允许该用户充值</label><button class="primary-btn wide">保存用户</button></form>`;const form=$('#userForm');form.onsubmit=async e=>{e.preventDefault();const f=new FormData(form);const id=f.get('id');try{await api(`/api/admin/users/${encodeURIComponent(id)}`,{method:'PUT',body:JSON.stringify({...Object.fromEntries(f),enabled:f.has('enabled')})});closeModal();toast('用户已保存');renderUsers()}catch(err){toast(err.message,'error')}};openModal()}
async function renderPackages(){const d=await api('/api/admin/packages');$('#content').innerHTML=`<div class="section-lead"><div><h2>充值套餐</h2><p>配置前台显示的充值金额、到账积分和展示顺序。</p></div><button id="addPackage" class="primary-btn">+ 新增套餐</button></div><div class="package-admin-grid">${d.rows.map(p=>`<article class="package-admin-card ${p.enabled?'':'disabled'}"><span>${esc(p.name)}</span><strong>${fmtMoney(p.amount_cents)}</strong><p>到账 <b>${Number(p.points).toLocaleString('zh-CN')}</b> 积分</p><small>排序 ${p.sort_order} · ${p.enabled?'已启用':'已停用'}</small><button class="secondary-btn wide" data-package="${p.id}">编辑套餐</button></article>`).join('')}</div>`;$('#addPackage').onclick=()=>openPackage();document.querySelectorAll('[data-package]').forEach(b=>b.onclick=()=>openPackage(d.rows.find(p=>String(p.id)===b.dataset.package)))}
function openPackage(pkg={}){const isNew=!pkg.id;$('#modalContent').innerHTML=`<span class="eyebrow">${isNew?'新增':'编辑'}充值套餐</span><h2>套餐配置</h2><form id="packageForm" class="settings-form"><label class="field">套餐名称<input name="name" value="${esc(pkg.name||'')}" placeholder="例如 超值充值" required></label><div class="inline-fields"><label class="field">显示金额(元)<input name="amount" type="number" min="0.01" step="0.01" value="${pkg.id?(pkg.amount_cents/100).toFixed(2):''}" required></label><label class="field">到账积分<input name="points" type="number" min="0" step="1" value="${Number(pkg.points||0)}" required></label></div><label class="field">展示顺序<input name="sort_order" type="number" step="1" value="${Number(pkg.sort_order||0)}"></label><label class="toggle-field"><input name="enabled" type="checkbox" ${isNew||pkg.enabled?'checked':''}><span></span>在充值页显示</label><button class="primary-btn wide">保存套餐</button></form>`;const form=$('#packageForm');form.onsubmit=async e=>{e.preventDefault();const f=new FormData(form);try{await api(`/api/admin/packages/${pkg.id||'new'}`,{method:'PUT',body:JSON.stringify({...Object.fromEntries(f),enabled:f.has('enabled')})});closeModal();toast('充值套餐已保存');renderPackages()}catch(err){toast(err.message,'error')}};openModal()}
+1 -1
View File
@@ -48,6 +48,6 @@
<div class="history-table-wrap"><table><thead><tr><th>充值时间</th><th>订单号</th><th>支付渠道</th><th>充值金额</th><th>获得积分</th></tr></thead><tbody id="historyBody"></tbody></table></div>
</section>
<footer class="checkout-footer"><span>支付过程受签名验证与金额校验保护</span><span>如有疑问请联系商户</span></footer>
<script src="/assets/checkout.js?v=20261102-quota5000" defer></script>
<script src="/assets/checkout.js?v=20261109-quota-map" defer></script>
</body>
</html>
+3 -6
View File
@@ -14,10 +14,7 @@ function showInvalidUser(value) { $('#userGate').classList.add('hidden'); $('#ch
function channelName(channel) { return ({ alipay: '支付宝', wechat: '微信支付', mock: '本地模拟' })[channel] || channel; }
function channelIcon(channel) { return channel === 'alipay' ? '支' : channel === 'wechat' ? '微' : 'M'; }
function formatTime(value) { return new Date(value).toLocaleString('zh-CN', { hour12: false }); }
function formatAvailablePoints(value) {
const quota = Number(value ?? 0);
return Math.ceil((Number.isFinite(quota) ? quota : 0) / 5000).toLocaleString('zh-CN');
}
function formatAvailablePoints(value) { return Number(value ?? 0).toLocaleString('zh-CN'); }
function syncAmount() {
const amount = state.selectedPackage ? (state.selectedPackage.amount_cents / 100).toFixed(2) : '0.00';
@@ -63,7 +60,7 @@ async function init() {
const response = await fetch(`/api/checkout/users/${encodeURIComponent(userId)}`); const data = await response.json();
if (!response.ok) return showInvalidUser(userId);
state.user = data.user; state.packages = data.packages;
$('#userName').textContent = data.user.username || data.user.displayName; $('#userAvatar').textContent = (data.user.username || data.user.displayName || data.user.id).slice(0, 1).toUpperCase(); $('#pointsBalance').textContent = formatAvailablePoints(data.user.quota);
$('#userName').textContent = data.user.username || data.user.displayName; $('#userAvatar').textContent = (data.user.username || data.user.displayName || data.user.id).slice(0, 1).toUpperCase(); $('#pointsBalance').textContent = formatAvailablePoints(data.user.pointsBalance);
renderPackages(); renderHistory(data.history); await loadGateways(); syncAmount();
$('#userGate').classList.add('hidden'); $('#checkoutMain').classList.remove('hidden'); $('#historyPanel').classList.remove('hidden');
} catch { showInvalidUser(userId); }
@@ -101,7 +98,7 @@ async function checkStatus() {
async function refreshUserBalance() {
try {
const data = await fetch(`/api/checkout/users/${encodeURIComponent(state.user.id)}`).then((response) => response.json());
if (data.user) { state.user = { ...state.user, ...data.user }; $('#pointsBalance').textContent = formatAvailablePoints(data.user.quota); }
if (data.user) { state.user = { ...state.user, ...data.user }; $('#pointsBalance').textContent = formatAvailablePoints(data.user.pointsBalance); }
} catch { /* 保留最后一次已加载的额度 */ }
}