feat(credits): exchange balance for points

Replace the legacy points-to-balance and external points purchase flows
with direct integer balance-to-points exchange. Enforce exchange and
points-transfer limits and capability checks across the UI and REST API.
This commit is contained in:
2026-08-13 15:20:06 +08:00
parent f9bce15c9a
commit 1247f9bf4e
18 changed files with 234 additions and 648 deletions
@@ -20,9 +20,11 @@ export const rechargeSchema = {
pay_balance_pass_charge_s: false, pay_balance_pass_charge_s: false,
pay_balance_pass_charge_desc: '', pay_balance_pass_charge_desc: '',
pay_balance_pass_charge_only_password: false, pay_balance_pass_charge_only_password: false,
pay_balance_exchange_s: false, pay_balance_points_exchange_s: false,
pay_balance_exchange_rate: 100, pay_balance_points_exchange_rate: 100,
pay_balance_exchange_desc: '', pay_balance_points_exchange_min_points: 100,
pay_balance_points_exchange_daily_max_points: 100000,
pay_balance_points_exchange_desc: '',
pay_balance_withdraw_s: false, pay_balance_withdraw_s: false,
}, },
groups: [ groups: [
@@ -79,12 +81,14 @@ export const rechargeSchema = {
}, },
{ {
key: 'exchange', key: 'exchange',
title: '积分兑换', title: '余额兑换积分',
icon: 'fas fa-coins', icon: 'fas fa-coins',
fields: [ fields: [
{ key: 'pay_balance_exchange_s', label: '启用积分兑换', type: 'switch', default: false }, { key: 'pay_balance_points_exchange_s', label: '启用余额兑换积分', type: 'switch', default: false, dependsOn: { key: 'pay_balance_s', value: true } },
{ key: 'pay_balance_exchange_rate', label: '兑换比例', type: 'number', default: 100, min: 1, max: 10000, help: 'N 积分 = 1 元', dependsOn: { key: 'pay_balance_exchange_s', value: true } }, { key: 'pay_balance_points_exchange_rate', label: '兑换比例', type: 'number', default: 100, min: 1, max: 10000, help: '1 余额 = N 积分', dependsOn: { key: 'pay_balance_points_exchange_s', value: true } },
{ key: 'pay_balance_exchange_desc', label: '兑换说明', type: 'textarea', default: '', dependsOn: { key: 'pay_balance_exchange_s', value: true } }, { key: 'pay_balance_points_exchange_min_points', label: '单笔最低购买积分', type: 'number', default: 100, min: 1, max: 10000000, dependsOn: { key: 'pay_balance_points_exchange_s', value: true } },
{ key: 'pay_balance_points_exchange_daily_max_points', label: '每日最高购买积分', type: 'number', default: 100000, min: 1, max: 10000000, dependsOn: { key: 'pay_balance_points_exchange_s', value: true } },
{ key: 'pay_balance_points_exchange_desc', label: '兑换说明', type: 'textarea', default: '', dependsOn: { key: 'pay_balance_points_exchange_s', value: true } },
], ],
}, },
{ {
@@ -5,8 +5,6 @@ export const creditsSchema = {
description: '积分规则、积分日志、用户积分管理。', description: '积分规则、积分日志、用户积分管理。',
defaults: { defaults: {
points_s: true, points_s: true,
points_pay_s: false,
points_rate: 100,
points_name: '积分', points_name: '积分',
points_decimal: 2, points_decimal: 2,
points_earn_daily_limit: 50, points_earn_daily_limit: 50,
@@ -43,12 +41,6 @@ export const creditsSchema = {
icon: 'fas fa-coins', icon: 'fas fa-coins',
fields: [ fields: [
{ key: 'points_s', label: '启用积分系统', type: 'switch', default: true }, { key: 'points_s', label: '启用积分系统', type: 'switch', default: true },
{ key: 'points_pay_s', label: '启用购买积分', type: 'switch', default: false, help: '对齐 zibll points_pay_s:允许用户用现金/余额购买积分。' },
{ key: 'points_rate', label: '积分汇率(1元=N积分)', type: 'number', default: 100, min: 1, max: 10000, dependsOn: { key: 'points_pay_s', value: true } },
{ key: 'pay_points_desc', label: '购买积分说明', type: 'textarea', default: '', dependsOn: { key: 'points_pay_s', value: true } },
{ key: 'pay_points_product', label: '积分套餐', type: 'textarea', default: '', help: '每行:支付金额|积分数量|标题。留空则仅自定义数量。', dependsOn: { key: 'points_pay_s', value: true } },
{ key: 'pay_points_product_custom_s', label: '允许自定义积分数量', type: 'switch', default: true, dependsOn: { key: 'points_pay_s', value: true } },
{ key: 'pay_points_product_custom_limit', label: '自定义积分上限', type: 'number', default: 99999, min: 1, max: 999999, dependsOn: { key: 'points_pay_s', value: true } },
{ key: 'points_name', label: '积分名称', type: 'input', default: '积分' }, { key: 'points_name', label: '积分名称', type: 'input', default: '积分' },
{ key: 'points_decimal', label: '积分小数位数', type: 'number', default: 2, min: 0, max: 4 }, { key: 'points_decimal', label: '积分小数位数', type: 'number', default: 2, min: 0, max: 4 },
], ],
+42 -85
View File
@@ -692,6 +692,10 @@
var recipientInput = modal.querySelector('[data-aksrt-transfer-recipient]'); var recipientInput = modal.querySelector('[data-aksrt-transfer-recipient]');
var typeInput = modal.querySelector('[data-aksrt-transfer-type]'); var typeInput = modal.querySelector('[data-aksrt-transfer-type]');
var title = modal.querySelector('[data-aksrt-transfer-title]'); var title = modal.querySelector('[data-aksrt-transfer-title]');
var amountLabel = modal.querySelector('[data-aksrt-transfer-amount-label]');
var balanceInfo = modal.querySelector('[data-aksrt-transfer-balance-info]');
var pointsInfo = modal.querySelector('[data-aksrt-transfer-points-info]');
var pointsTransferMin = 1;
var searchTimer = null; var searchTimer = null;
var busy = false; var busy = false;
function setTip(text, isError) { function setTip(text, isError) {
@@ -702,8 +706,21 @@
document.querySelectorAll('[data-aksrt-transfer-open]').forEach(function (btn) { document.querySelectorAll('[data-aksrt-transfer-open]').forEach(function (btn) {
btn.addEventListener('click', function () { btn.addEventListener('click', function () {
var type = btn.getAttribute('data-aksrt-transfer-open') || 'balance'; var type = btn.getAttribute('data-aksrt-transfer-open') || 'balance';
pointsTransferMin = type === 'points'
? Math.max(1, parseInt(btn.getAttribute('data-aksrt-transfer-min') || '1', 10) || 1)
: 1;
if (typeInput) typeInput.value = type; if (typeInput) typeInput.value = type;
if (title) title.textContent = type === 'points' ? '积分转账' : '余额转账'; if (title) title.textContent = type === 'points' ? '积分转账' : '余额转账';
var amountEl = form ? form.querySelector('[data-aksrt-transfer-amount]') : null;
if (amountEl) {
amountEl.min = type === 'points' ? String(pointsTransferMin) : '0.01';
amountEl.step = type === 'points' ? '1' : '0.01';
amountEl.inputMode = type === 'points' ? 'numeric' : 'decimal';
amountEl.value = '';
}
if (amountLabel) amountLabel.textContent = type === 'points' ? '积分' : '金额';
if (balanceInfo) balanceInfo.hidden = type === 'points';
if (pointsInfo) pointsInfo.hidden = type !== 'points';
if (results) results.innerHTML = ''; if (results) results.innerHTML = '';
if (selected) selected.textContent = ''; if (selected) selected.textContent = '';
if (recipientInput) recipientInput.value = ''; if (recipientInput) recipientInput.value = '';
@@ -762,7 +779,7 @@
setTip('请选择收款用户', true); setTip('请选择收款用户', true);
return; return;
} }
if (!(parseFloat(amount) > 0)) { if (!(parseFloat(amount) > 0) || (type === 'points' && (!Number.isInteger(Number(amount)) || Number(amount) < pointsTransferMin))) {
setTip('请输入有效金额', true); setTip('请输入有效金额', true);
return; return;
} }
@@ -787,102 +804,49 @@
}); });
} }
function initExchange() { function initPointsExchange() {
var modal = document.querySelector('[data-aksrt-exchange-modal]'); var modal = document.querySelector('[data-aksrt-points-exchange-modal]');
if (!modal) return; if (!modal) return;
var form = modal.querySelector('[data-aksrt-exchange-form]'); var form = modal.querySelector('[data-aksrt-points-exchange-form]');
var tip = modal.querySelector('[data-aksrt-exchange-tip]'); var tip = modal.querySelector('[data-aksrt-points-exchange-tip]');
var amountEl = form ? form.querySelector('[data-aksrt-points-exchange-amount]') : null;
var preview = form ? form.querySelector('[data-aksrt-points-exchange-preview]') : null;
var busy = false; var busy = false;
function setTip(text, isError) { function setTip(text, isError) {
if (!tip) return; if (!tip) return;
tip.textContent = text || ''; tip.textContent = text || '';
tip.classList.toggle('is-error', !!isError); tip.classList.toggle('is-error', !!isError);
} }
document.querySelectorAll('[data-aksrt-exchange-open]').forEach(function (btn) { document.querySelectorAll('[data-aksrt-points-exchange-open]').forEach(function (btn) {
btn.addEventListener('click', function () { openModal(modal); }); btn.addEventListener('click', function () { openModal(modal); });
}); });
modal.querySelectorAll('[data-aksrt-exchange-close]').forEach(function (btn) { modal.querySelectorAll('[data-aksrt-points-exchange-close]').forEach(function (btn) {
btn.addEventListener('click', function () { closeModal(modal); }); btn.addEventListener('click', function () { closeModal(modal); });
}); });
if (!form) return; if (!form) return;
function updatePreview() {
if (!preview || !amountEl) return;
var amount = Number(amountEl.value || '0');
var rate = Number(amountEl.getAttribute('data-aksrt-points-exchange-rate') || '0');
preview.textContent = Number.isInteger(amount) && amount > 0 && rate > 0
? '预计获得 ' + (amount * rate) + ' 积分'
: '';
}
amountEl.addEventListener('input', updatePreview);
updatePreview();
form.addEventListener('submit', function (e) { form.addEventListener('submit', function (e) {
e.preventDefault(); e.preventDefault();
if (busy) return; if (busy) return;
var pointsEl = form.querySelector('[data-aksrt-exchange-points]'); var amount = amountEl ? Number(amountEl.value || '0') : 0;
var points = pointsEl ? parseInt(pointsEl.value || '0', 10) : 0; if (!Number.isInteger(amount) || !(amount > 0)) {
if (!(points > 0)) { setTip('请输入正整数余额', true);
setTip('请输入兑换积分数量', true);
return; return;
} }
busy = true; busy = true;
setTip('正在兑换…'); setTip('正在兑换…');
api('/pay/balance/exchange', { api('/pay/balance/points-exchange', {
method: 'POST', method: 'POST',
body: JSON.stringify({ points: points }) body: JSON.stringify({ amount: amount })
}).then(function (r) {
busy = false;
if (!r.ok || (r.json && r.json.code && !r.json.success)) {
setTip((r.json && r.json.message) || '兑换失败', true);
return;
}
var data = (r.json && r.json.data) ? r.json.data : r.json;
setTip((data && data.message) || '兑换成功,正在刷新…');
window.location.reload();
}).catch(function () {
busy = false;
setTip('网络错误,请重试', true);
});
});
}
function initPointsBuy() {
var modal = document.querySelector('[data-aksrt-points-buy-modal]');
if (!modal) return;
var form = modal.querySelector('[data-aksrt-points-buy-form]');
var tip = modal.querySelector('[data-aksrt-points-buy-tip]');
var busy = false;
function setTip(text, isError) {
if (!tip) return;
tip.textContent = text || '';
tip.classList.toggle('is-error', !!isError);
}
document.querySelectorAll('[data-aksrt-points-buy-open]').forEach(function (btn) {
btn.addEventListener('click', function () { openModal(modal); });
});
modal.querySelectorAll('[data-aksrt-points-buy-close]').forEach(function (btn) {
btn.addEventListener('click', function () { closeModal(modal); });
});
modal.querySelectorAll('.uc-charge-package input').forEach(function (inp) {
inp.addEventListener('change', function () {
modal.querySelectorAll('.uc-charge-package').forEach(function (el) {
el.classList.toggle('is-active', el.contains(inp) && inp.checked);
});
});
});
if (!form) return;
form.addEventListener('submit', function (e) {
e.preventDefault();
if (busy) return;
var pkgInput = form.querySelector('input[name="points_package"]:checked') || form.querySelector('input[name="points_package"]');
var pkg = pkgInput ? pkgInput.value : 'custom';
var customEl = form.querySelector('[data-aksrt-points-buy-custom]');
var custom = customEl ? parseInt(customEl.value || '0', 10) : 0;
if (custom > 0) pkg = 'custom';
if (pkg === 'custom' && !(custom > 0)) {
setTip('请输入购买积分数量', true);
return;
}
var methodEl = form.querySelector('input[name="points_pay_method"]:checked');
var method = methodEl ? methodEl.value : 'alipay';
busy = true;
setTip('正在创建订单…');
api('/pay/points/buy', {
method: 'POST',
body: JSON.stringify({
package: pkg,
custom_points: custom,
payment_method: method
})
}).then(function (r) { }).then(function (r) {
busy = false; busy = false;
if (!r.ok || (r.json && r.json.code && !r.json.success)) { if (!r.ok || (r.json && r.json.code && !r.json.success)) {
@@ -890,12 +854,6 @@
return; return;
} }
var data = (r.json && r.json.data) ? r.json.data : r.json; var data = (r.json && r.json.data) ? r.json.data : r.json;
if (data && data.redirect && (data.payment_url || data.qr_content)) {
if (data.payment_url) window.open(data.payment_url, '_blank');
setTip(data.message || '请完成支付,支付成功后将自动刷新。');
if (data.order_number) activePoll = pollPaidOrder(data.order_number, setTip, ['credits', 'orders']);
return;
}
setTip((data && data.message) || '购买成功,正在刷新…'); setTip((data && data.message) || '购买成功,正在刷新…');
window.location.reload(); window.location.reload();
}).catch(function () { }).catch(function () {
@@ -1044,8 +1002,7 @@
initCardPass(); initCardPass();
initBalanceCharge(); initBalanceCharge();
initTransfer(); initTransfer();
initExchange(); initPointsExchange();
initPointsBuy();
initWithdraw(); initWithdraw();
initWithdrawHistory(); initWithdrawHistory();
initAssetTabs(); initAssetTabs();
+4
View File
@@ -56,6 +56,10 @@ if (!function_exists('aksrt_credits_label')) {
'free_post_favorite'=> __('文章被收藏', 'aksrt'), 'free_post_favorite'=> __('文章被收藏', 'aksrt'),
'free_comment_new'=> __('发表评论', 'aksrt'), 'free_comment_new'=> __('发表评论', 'aksrt'),
'free_comment_like'=> __('评论被赞', 'aksrt'), 'free_comment_like'=> __('评论被赞', 'aksrt'),
'points_exchange_in' => __('余额兑换积分', 'aksrt'),
'transfer_in' => __('积分转入', 'aksrt'),
'transfer_out' => __('积分转出', 'aksrt'),
'transfer_refund' => __('积分转账退款', 'aksrt'),
]; ];
if (isset($map[$reason])) { if (isset($map[$reason])) {
return $map[$reason]; return $map[$reason];
@@ -24,8 +24,9 @@ $points_transfer_on = !empty($all_settings['points_transfer_s']);
if ($points_transfer_on && class_exists('\AKSRT\Settings\Capabilities') && !\AKSRT\Settings\Capabilities::user_can('points_transfer', $points_uid)) { if ($points_transfer_on && class_exists('\AKSRT\Settings\Capabilities') && !\AKSRT\Settings\Capabilities::user_can('points_transfer', $points_uid)) {
$points_transfer_on = false; $points_transfer_on = false;
} }
$points_buy_on = class_exists('\AKSRT\Credits\BalanceService') && \AKSRT\Credits\BalanceService::get_instance()->points_buy_enabled(); $points_transfer_min = max(1, (int) ($all_settings['points_transfer_min'] ?? 1));
$points_buy_view = $points_buy_on ? \AKSRT\Credits\BalanceService::get_instance()->get_points_buy_view((int) ($user_id ?? 0)) : []; $points_exchange = class_exists('\AKSRT\Settings\Settings') ? \AKSRT\Settings\Settings::get_payment_recharge_settings()['points_exchange'] ?? [] : [];
$points_exchange_on = !empty($points_exchange['enabled']) && class_exists('\AKSRT\Credits\Balance') && \AKSRT\Credits\Balance::enabled();
$currency = (string) ($currency_name ?? __('积分', 'aksrt')); $currency = (string) ($currency_name ?? __('积分', 'aksrt'));
?> ?>
<div class="uc-asset-card uc-asset-card--points"> <div class="uc-asset-card uc-asset-card--points">
@@ -46,10 +47,10 @@ $currency = (string) ($currency_name ?? __('积分', 'aksrt'));
</div> </div>
<div class="uc-asset-card__actions flex0"> <div class="uc-asset-card__actions flex0">
<?php if ($points_transfer_on) : ?> <?php if ($points_transfer_on) : ?>
<button type="button" class="but c-green mr6 hollow" data-aksrt-transfer-open="points"><?php esc_html_e('转账', 'aksrt'); ?></button> <button type="button" class="but c-green mr6 hollow" data-aksrt-transfer-open="points" data-aksrt-transfer-min="<?php echo esc_attr((string) $points_transfer_min); ?>"><?php esc_html_e('转账', 'aksrt'); ?></button>
<?php endif; ?> <?php endif; ?>
<?php if ($points_buy_on) : ?> <?php if ($points_exchange_on) : ?>
<button type="button" class="but c-green" data-aksrt-points-buy-open><?php esc_html_e('购买积分', 'aksrt'); ?></button> <button type="button" class="but c-green" data-aksrt-points-exchange-open><?php esc_html_e('购买积分', 'aksrt'); ?></button>
<?php endif; ?> <?php endif; ?>
</div> </div>
</div> </div>
@@ -57,54 +58,25 @@ $currency = (string) ($currency_name ?? __('积分', 'aksrt'));
<button type="button" class="uc-asset-card__link muted-2-color em09" data-aksrt-asset-tab="points_free"><?php esc_html_e('做任务赚积分', 'aksrt'); ?><i class="fa fa-angle-right em12 ml3" aria-hidden="true"></i></button> <button type="button" class="uc-asset-card__link muted-2-color em09" data-aksrt-asset-tab="points_free"><?php esc_html_e('做任务赚积分', 'aksrt'); ?><i class="fa fa-angle-right em12 ml3" aria-hidden="true"></i></button>
</div> </div>
<?php if ($points_buy_on) : <?php if ($points_exchange_on) :
$pb_packages = is_array($points_buy_view['packages'] ?? null) ? $points_buy_view['packages'] : []; $pb_rate = max(1, (int) ($points_exchange['rate'] ?? 100));
$pb_methods = is_array($points_buy_view['payment_methods'] ?? null) ? $points_buy_view['payment_methods'] : []; $pb_min_points = max(1, (int) ($points_exchange['min_points'] ?? 100));
$pb_rate = (int) ($points_buy_view['rate'] ?? 100); $pb_daily_max_points = max(1, (int) ($points_exchange['daily_max_points'] ?? 100000));
$pb_custom = !empty($points_buy_view['custom_s']);
$pb_limit = (int) ($points_buy_view['custom_limit'] ?? 99999);
?> ?>
<div class="uc-modal" id="aksrt-points-buy-modal" hidden data-aksrt-points-buy-modal> <div class="uc-modal" id="aksrt-points-exchange-modal" hidden data-aksrt-points-exchange-modal>
<div class="uc-modal__overlay" data-aksrt-points-buy-close></div> <div class="uc-modal__overlay" data-aksrt-points-exchange-close></div>
<div class="uc-modal__dialog" role="dialog" aria-modal="true"> <div class="uc-modal__dialog" role="dialog" aria-modal="true">
<button type="button" class="uc-modal__close" data-aksrt-points-buy-close aria-label="<?php esc_attr_e('关闭', 'aksrt'); ?>"><i class="fas fa-times" aria-hidden="true"></i></button> <button type="button" class="uc-modal__close" data-aksrt-points-exchange-close aria-label="<?php esc_attr_e('关闭', 'aksrt'); ?>"><i class="fas fa-times" aria-hidden="true"></i></button>
<h3 class="uc-modal__title"><i class="fas fa-coins mr6" aria-hidden="true"></i><?php esc_html_e('购买积分', 'aksrt'); ?></h3> <h3 class="uc-modal__title"><i class="fas fa-coins mr6" aria-hidden="true"></i><?php esc_html_e('购买积分', 'aksrt'); ?></h3>
<?php if (!empty($points_buy_view['desc'])) : ?> <?php if (!empty($points_exchange['desc'])) : ?>
<div class="uc-modal__desc muted-box em09"><?php echo esc_html((string) $points_buy_view['desc']); ?></div> <div class="uc-modal__desc muted-box em09"><?php echo esc_html((string) $points_exchange['desc']); ?></div>
<?php endif; ?> <?php endif; ?>
<form data-aksrt-points-buy-form> <form data-aksrt-points-exchange-form>
<?php if ($pb_packages) : ?> <label class="muted-color em09"><?php esc_html_e('兑换余额', 'aksrt'); ?></label>
<div class="muted-color mb6"><?php esc_html_e('请选择积分套餐', 'aksrt'); ?></div> <input type="number" class="uc-card-pass__input" name="amount" min="1" step="1" inputmode="numeric" data-aksrt-points-exchange-amount data-aksrt-points-exchange-rate="<?php echo esc_attr((string) $pb_rate); ?>">
<div class="uc-charge-packages"> <p class="muted-2-color em09 mt6"><?php printf(esc_html__('1 余额 = %d 积分;单笔至少 %d 积分,每日最多 %d 积分。', 'aksrt'), $pb_rate, $pb_min_points, $pb_daily_max_points); ?></p>
<?php foreach ($pb_packages as $idx => $pkg) : ?> <p class="muted-2-color em09 mt6" data-aksrt-points-exchange-preview></p>
<label class="uc-charge-package<?php echo $idx === 0 ? ' is-active' : ''; ?>"> <p class="uc-modal__tip" data-aksrt-points-exchange-tip></p>
<input type="radio" name="points_package" value="<?php echo esc_attr((string) $pkg['key']); ?>" <?php checked($idx === 0); ?>>
<div class="uc-charge-package__credit"><?php echo esc_html((string) (int) $pkg['points']); ?> <span class="px12"><?php echo esc_html($currency); ?></span></div>
<div class="uc-charge-package__pay c-red"><span class="px12">¥</span><?php echo esc_html((string) $pkg['pay_price']); ?></div>
</label>
<?php endforeach; ?>
</div>
<?php endif; ?>
<?php if ($pb_custom) : ?>
<div class="muted-color mt16 mb6"><?php echo $pb_packages ? esc_html__('自定义积分数量', 'aksrt') : esc_html__('请输入购买积分数量', 'aksrt'); ?></div>
<input type="number" class="uc-card-pass__input" name="custom_points" min="<?php echo esc_attr((string) $pb_rate); ?>" max="<?php echo esc_attr((string) $pb_limit); ?>" step="1" data-aksrt-points-buy-custom>
<p class="muted-2-color em09 mt6"><?php printf(esc_html__('1 元 = %d 积分', 'aksrt'), $pb_rate); ?></p>
<?php if (!$pb_packages) : ?>
<input type="hidden" name="points_package" value="custom">
<?php endif; ?>
<?php endif; ?>
<?php if ($pb_methods) : ?>
<div class="muted-color mt16 mb6"><?php esc_html_e('支付方式', 'aksrt'); ?></div>
<div class="uc-charge-methods">
<?php foreach ($pb_methods as $mi => $m) : ?>
<label class="uc-charge-method">
<input type="radio" name="points_pay_method" value="<?php echo esc_attr((string) ($m['id'] ?? '')); ?>" <?php checked($mi === 0); ?>>
<span><?php echo esc_html((string) ($m['name'] ?? $m['id'] ?? '')); ?></span>
</label>
<?php endforeach; ?>
</div>
<?php endif; ?>
<p class="uc-modal__tip" data-aksrt-points-buy-tip></p>
<button type="submit" class="but jb-blue btn-block mt10"><?php esc_html_e('立即购买', 'aksrt'); ?></button> <button type="submit" class="but jb-blue btn-block mt10"><?php esc_html_e('立即购买', 'aksrt'); ?></button>
</form> </form>
</div> </div>
@@ -26,7 +26,6 @@ $transfer_on = !empty($recharge['transfer']['enabled']);
if ($transfer_on && class_exists('\AKSRT\Settings\Capabilities') && !\AKSRT\Settings\Capabilities::user_can('balance_transfer', $uid)) { if ($transfer_on && class_exists('\AKSRT\Settings\Capabilities') && !\AKSRT\Settings\Capabilities::user_can('balance_transfer', $uid)) {
$transfer_on = false; $transfer_on = false;
} }
$exchange_on = !empty($recharge['exchange']['enabled']);
$all_settings = class_exists('\AKSRT\Settings\Settings') ? \AKSRT\Settings\Settings::get_all() : []; $all_settings = class_exists('\AKSRT\Settings\Settings') ? \AKSRT\Settings\Settings::get_all() : [];
$withdraw_on = !empty($all_settings['pay_balance_withdraw_s']); $withdraw_on = !empty($all_settings['pay_balance_withdraw_s']);
if ($withdraw_on && class_exists('\AKSRT\Settings\Capabilities') && !\AKSRT\Settings\Capabilities::user_can('balance_withdraw', $uid)) { if ($withdraw_on && class_exists('\AKSRT\Settings\Capabilities') && !\AKSRT\Settings\Capabilities::user_can('balance_withdraw', $uid)) {
@@ -89,18 +88,9 @@ $mark = (string) ($charge_view['currency_mark'] ?? '元');
<button type="button" class="but b-blue-2" data-aksrt-charge-open><?php esc_html_e('充值', 'aksrt'); ?></button> <button type="button" class="but b-blue-2" data-aksrt-charge-open><?php esc_html_e('充值', 'aksrt'); ?></button>
</div> </div>
</div> </div>
<?php if ($exchange_on) : ?>
<button type="button" class="uc-asset-card__link muted-2-color em09" data-aksrt-exchange-open>
<?php
$rate = (int) ($recharge['exchange']['rate'] ?? 100);
printf(esc_html__('积分兑换余额(%d 积分 = 1 元)', 'aksrt'), $rate);
?>
<i class="fa fa-angle-right em12 ml3" aria-hidden="true"></i>
</button>
<?php endif; ?>
<?php if ($withdraw_on) : ?> <?php if ($withdraw_on) : ?>
<div class="uc-asset-card__foot muted-2-color em09 mt6"> <div class="uc-asset-card__foot muted-2-color em09 mt6">
<span><?php printf(esc_html__('处理中冻结 %s', 'aksrt'), esc_html(class_exists('\AKSRT\Credits\Balance') ? \AKSRT\Credits\Balance::format((float) $withdraw_pending_hold) : number_format_i18n((float) $withdraw_pending_hold, 2))); ?></span> <span><?php printf(esc_html__('冻结中 %s', 'aksrt'), esc_html(class_exists('\AKSRT\Credits\Balance') ? \AKSRT\Credits\Balance::format((float) $withdraw_pending_hold) : number_format_i18n((float) $withdraw_pending_hold, 2))); ?></span>
</div> </div>
<?php endif; ?> <?php endif; ?>
</div> </div>
@@ -181,60 +171,6 @@ $mark = (string) ($charge_view['currency_mark'] ?? '元');
</div> </div>
</div> </div>
<!-- Transfer modal (balance) -->
<div class="uc-modal" id="aksrt-transfer-modal" hidden data-aksrt-transfer-modal>
<div class="uc-modal__overlay" data-aksrt-transfer-close></div>
<div class="uc-modal__dialog" role="dialog" aria-modal="true">
<button type="button" class="uc-modal__close" data-aksrt-transfer-close aria-label="<?php esc_attr_e('关闭', 'aksrt'); ?>"><i class="fas fa-times" aria-hidden="true"></i></button>
<h3 class="uc-modal__title" data-aksrt-transfer-title><?php esc_html_e('余额转账', 'aksrt'); ?></h3>
<form data-aksrt-transfer-form>
<input type="hidden" name="type" value="balance" data-aksrt-transfer-type>
<div class="mb10">
<label class="muted-color em09"><?php esc_html_e('收款用户', 'aksrt'); ?></label>
<input type="search" class="uc-card-pass__input" data-aksrt-transfer-search placeholder="<?php esc_attr_e('搜索用户名/昵称/邮箱', 'aksrt'); ?>" autocomplete="off">
<div class="uc-transfer-results" data-aksrt-transfer-results></div>
<input type="hidden" name="recipient" value="" data-aksrt-transfer-recipient>
<div class="uc-transfer-selected muted-2-color em09 mt6" data-aksrt-transfer-selected></div>
</div>
<div class="mb10">
<label class="muted-color em09"><?php esc_html_e('金额', 'aksrt'); ?></label>
<input type="number" class="uc-card-pass__input" name="amount" min="0.01" step="0.01" data-aksrt-transfer-amount>
</div>
<?php if (!empty($recharge['transfer']['desc'])) : ?>
<div class="muted-box em09 mb10"><?php echo esc_html((string) $recharge['transfer']['desc']); ?></div>
<?php endif; ?>
<?php if (!empty($recharge['transfer']['service_charge'])) : ?>
<div class="c-yellow em09 mb10"><?php printf(esc_html__('转账将扣除 %s%% 手续费', 'aksrt'), esc_html((string) (int) $recharge['transfer']['service_charge'])); ?></div>
<?php endif; ?>
<p class="uc-modal__tip" data-aksrt-transfer-tip></p>
<button type="submit" class="but jb-blue btn-block" data-aksrt-transfer-submit><?php esc_html_e('确认转账', 'aksrt'); ?></button>
</form>
</div>
</div>
<!-- Exchange modal -->
<?php if ($exchange_on) : ?>
<div class="uc-modal" id="aksrt-exchange-modal" hidden data-aksrt-exchange-modal>
<div class="uc-modal__overlay" data-aksrt-exchange-close></div>
<div class="uc-modal__dialog" role="dialog" aria-modal="true">
<button type="button" class="uc-modal__close" data-aksrt-exchange-close aria-label="<?php esc_attr_e('关闭', 'aksrt'); ?>"><i class="fas fa-times" aria-hidden="true"></i></button>
<h3 class="uc-modal__title"><?php esc_html_e('积分兑换余额', 'aksrt'); ?></h3>
<?php if (!empty($recharge['exchange']['desc'])) : ?>
<div class="muted-box em09 mb10"><?php echo esc_html((string) $recharge['exchange']['desc']); ?></div>
<?php endif; ?>
<form data-aksrt-exchange-form>
<label class="muted-color em09"><?php esc_html_e('兑换积分数量', 'aksrt'); ?></label>
<input type="number" class="uc-card-pass__input" name="points" min="<?php echo esc_attr((string) (int) ($recharge['exchange']['rate'] ?? 100)); ?>" step="1" data-aksrt-exchange-points>
<p class="muted-2-color em09 mt6">
<?php printf(esc_html__('比例:%d 积分 = 1 元(向下取整)', 'aksrt'), (int) ($recharge['exchange']['rate'] ?? 100)); ?>
</p>
<p class="uc-modal__tip" data-aksrt-exchange-tip></p>
<button type="submit" class="but jb-blue btn-block" data-aksrt-exchange-submit><?php esc_html_e('确认兑换', 'aksrt'); ?></button>
</form>
</div>
</div>
<?php endif; ?>
<?php if ($withdraw_on) : <?php if ($withdraw_on) :
$withdraw_modal_rendered = !empty($GLOBALS['aksrt_withdraw_modal_rendered']); $withdraw_modal_rendered = !empty($GLOBALS['aksrt_withdraw_modal_rendered']);
if (!$withdraw_modal_rendered) { if (!$withdraw_modal_rendered) {
@@ -42,6 +42,10 @@ if ($show_credits) {
require $dir . '/credits-signin.php'; require $dir . '/credits-signin.php';
} }
if ($show_wallet || $show_credits) {
require $dir . '/transfer-modal.php';
}
// Tabbed ledgers (Zibll record tabs). // Tabbed ledgers (Zibll record tabs).
if ($show_wallet || $show_credits) : if ($show_wallet || $show_credits) :
$active_record = $show_wallet ? 'balance' : 'points'; $active_record = $show_wallet ? 'balance' : 'points';
@@ -0,0 +1,53 @@
<?php
/**
* Shared transfer modal for balance and points assets.
*
* @package AKSRT
*/
defined('ABSPATH') || exit;
$transfer_recharge = class_exists('\AKSRT\Settings\Settings') && method_exists('\AKSRT\Settings\Settings', 'get_payment_recharge_settings')
? \AKSRT\Settings\Settings::get_payment_recharge_settings()
: [];
$transfer_all_settings = class_exists('\AKSRT\Settings\Settings') ? \AKSRT\Settings\Settings::get_all() : [];
$points_transfer_min = max(1, (int) ($transfer_all_settings['points_transfer_min'] ?? 1));
$points_transfer_fee = max(0, min(50, (int) ($transfer_all_settings['points_service_charge'] ?? 0)));
?>
<div class="uc-modal" id="aksrt-transfer-modal" hidden data-aksrt-transfer-modal>
<div class="uc-modal__overlay" data-aksrt-transfer-close></div>
<div class="uc-modal__dialog" role="dialog" aria-modal="true">
<button type="button" class="uc-modal__close" data-aksrt-transfer-close aria-label="<?php esc_attr_e('关闭', 'aksrt'); ?>"><i class="fas fa-times" aria-hidden="true"></i></button>
<h3 class="uc-modal__title" data-aksrt-transfer-title><?php esc_html_e('余额转账', 'aksrt'); ?></h3>
<form data-aksrt-transfer-form>
<input type="hidden" name="type" value="balance" data-aksrt-transfer-type>
<div class="mb10">
<label class="muted-color em09"><?php esc_html_e('收款用户', 'aksrt'); ?></label>
<input type="search" class="uc-card-pass__input" data-aksrt-transfer-search placeholder="<?php esc_attr_e('搜索用户名/昵称/邮箱', 'aksrt'); ?>" autocomplete="off">
<div class="uc-transfer-results" data-aksrt-transfer-results></div>
<input type="hidden" name="recipient" value="" data-aksrt-transfer-recipient>
<div class="uc-transfer-selected muted-2-color em09 mt6" data-aksrt-transfer-selected></div>
</div>
<div class="mb10">
<label class="muted-color em09" data-aksrt-transfer-amount-label><?php esc_html_e('金额', 'aksrt'); ?></label>
<input type="number" class="uc-card-pass__input" name="amount" min="0.01" step="0.01" data-aksrt-transfer-amount>
</div>
<div data-aksrt-transfer-balance-info>
<?php if (!empty($transfer_recharge['transfer']['desc'])) : ?>
<div class="muted-box em09 mb10"><?php echo esc_html((string) $transfer_recharge['transfer']['desc']); ?></div>
<?php endif; ?>
<?php if (!empty($transfer_recharge['transfer']['service_charge'])) : ?>
<div class="c-yellow em09 mb10"><?php printf(esc_html__('转账将扣除 %s%% 手续费', 'aksrt'), esc_html((string) (int) $transfer_recharge['transfer']['service_charge'])); ?></div>
<?php endif; ?>
</div>
<div class="muted-box em09 mb10" hidden data-aksrt-transfer-points-info>
<?php printf(esc_html__('积分转账仅支持正整数,单笔至少 %d 积分。', 'aksrt'), $points_transfer_min); ?>
<?php if ($points_transfer_fee > 0) : ?>
<?php printf(esc_html__(' 将扣除 %d%% 手续费。', 'aksrt'), $points_transfer_fee); ?>
<?php endif; ?>
</div>
<p class="uc-modal__tip" data-aksrt-transfer-tip></p>
<button type="submit" class="but jb-blue btn-block" data-aksrt-transfer-submit><?php esc_html_e('确认转账', 'aksrt'); ?></button>
</form>
</div>
</div>
+6 -4
View File
@@ -46,10 +46,12 @@ class SchemaPayment {
['key' => 'pay_balance_pass_charge_desc', 'label' => '卡密兑换说明', 'type' => 'textarea', 'default' => '', 'dependsOn' => ['key' => 'pay_balance_pass_charge_s', 'value' => true]], ['key' => 'pay_balance_pass_charge_desc', 'label' => '卡密兑换说明', 'type' => 'textarea', 'default' => '', 'dependsOn' => ['key' => 'pay_balance_pass_charge_s', 'value' => true]],
['key' => 'pay_balance_pass_charge_only_password', 'label' => '仅密码兑换', 'type' => 'switch', 'default' => false, 'dependsOn' => ['key' => 'pay_balance_pass_charge_s', 'value' => true]], ['key' => 'pay_balance_pass_charge_only_password', 'label' => '仅密码兑换', 'type' => 'switch', 'default' => false, 'dependsOn' => ['key' => 'pay_balance_pass_charge_s', 'value' => true]],
]], ]],
['key' => 'exchange', 'title' => '积分兑换', 'fields' => [ ['key' => 'points-exchange', 'title' => '余额兑换积分', 'fields' => [
['key' => 'pay_balance_exchange_s', 'label' => '启用积分兑换', 'type' => 'switch', 'default' => false], ['key' => 'pay_balance_points_exchange_s', 'label' => '启用余额兑换积分', 'type' => 'switch', 'default' => false, 'dependsOn' => ['key' => 'pay_balance_s', 'value' => true]],
['key' => 'pay_balance_exchange_rate', 'label' => '兑换比例', 'type' => 'number', 'default' => 100, 'min' => 1, 'max' => 10000, 'dependsOn' => ['key' => 'pay_balance_exchange_s', 'value' => true]], ['key' => 'pay_balance_points_exchange_rate', 'label' => '兑换比例', 'type' => 'number', 'default' => 100, 'min' => 1, 'max' => 10000, 'help' => '1 余额 = N 积分', 'dependsOn' => ['key' => 'pay_balance_points_exchange_s', 'value' => true]],
['key' => 'pay_balance_exchange_desc', 'label' => '兑换说明', 'type' => 'textarea', 'default' => '', 'dependsOn' => ['key' => 'pay_balance_exchange_s', 'value' => true]], ['key' => 'pay_balance_points_exchange_min_points', 'label' => '单笔最低购买积分', 'type' => 'number', 'default' => 100, 'min' => 1, 'max' => 10000000, 'dependsOn' => ['key' => 'pay_balance_points_exchange_s', 'value' => true]],
['key' => 'pay_balance_points_exchange_daily_max_points', 'label' => '每日最高购买积分', 'type' => 'number', 'default' => 100000, 'min' => 1, 'max' => 10000000, 'dependsOn' => ['key' => 'pay_balance_points_exchange_s', 'value' => true]],
['key' => 'pay_balance_points_exchange_desc', 'label' => '兑换说明', 'type' => 'textarea', 'default' => '', 'dependsOn' => ['key' => 'pay_balance_points_exchange_s', 'value' => true]],
]], ]],
['key' => 'withdraw', 'title' => '余额提现', 'fields' => [ ['key' => 'withdraw', 'title' => '余额提现', 'fields' => [
['key' => 'pay_balance_withdraw_s', 'label' => '启用余额提现', 'type' => 'switch', 'default' => false, 'dependsOn' => ['key' => 'pay_balance_s', 'value' => true]], ['key' => 'pay_balance_withdraw_s', 'label' => '启用余额提现', 'type' => 'switch', 'default' => false, 'dependsOn' => ['key' => 'pay_balance_s', 'value' => true]],
-2
View File
@@ -515,8 +515,6 @@ class SchemaUsers {
'groups' => [ 'groups' => [
['key' => 'basic', 'title' => '积分基础', 'fields' => [ ['key' => 'basic', 'title' => '积分基础', 'fields' => [
['key' => 'points_s', 'label' => '启用积分系统', 'type' => 'switch', 'default' => true], ['key' => 'points_s', 'label' => '启用积分系统', 'type' => 'switch', 'default' => true],
['key' => 'points_pay_s', 'label' => '积分支付', 'type' => 'switch', 'default' => false],
['key' => 'points_rate', 'label' => '积分兑换比例', 'type' => 'number', 'default' => 100, 'min' => 1, 'max' => 10000],
['key' => 'points_name', 'label' => '积分名称', 'type' => 'input', 'default' => '积分'], ['key' => 'points_name', 'label' => '积分名称', 'type' => 'input', 'default' => '积分'],
['key' => 'points_decimal', 'label' => '积分小数位数', 'type' => 'number', 'default' => 2, 'min' => 0, 'max' => 4], ['key' => 'points_decimal', 'label' => '积分小数位数', 'type' => 'number', 'default' => 2, 'min' => 0, 'max' => 4],
]], ]],
-3
View File
@@ -28,8 +28,6 @@ class DomainModel {
public const ORDER_PRODUCT_RESOURCE = 'resource'; public const ORDER_PRODUCT_RESOURCE = 'resource';
public const ORDER_PRODUCT_VIP = 'vip'; public const ORDER_PRODUCT_VIP = 'vip';
public const ORDER_PRODUCT_RECHARGE = 'recharge'; public const ORDER_PRODUCT_RECHARGE = 'recharge';
/** Cash purchase of points (zibll order_type=9). */
public const ORDER_PRODUCT_POINTS_BUY = 'points_buy';
/** /**
* Human labels for aksrt_order.product_type (front-end order center). * Human labels for aksrt_order.product_type (front-end order center).
@@ -41,7 +39,6 @@ class DomainModel {
self::ORDER_PRODUCT_RESOURCE => __('付费内容', 'aksrt'), self::ORDER_PRODUCT_RESOURCE => __('付费内容', 'aksrt'),
self::ORDER_PRODUCT_VIP => __('VIP 会员', 'aksrt'), self::ORDER_PRODUCT_VIP => __('VIP 会员', 'aksrt'),
self::ORDER_PRODUCT_RECHARGE => __('余额充值', 'aksrt'), self::ORDER_PRODUCT_RECHARGE => __('余额充值', 'aksrt'),
self::ORDER_PRODUCT_POINTS_BUY => __('购买积分', 'aksrt'),
]; ];
} }
+2 -1
View File
@@ -366,7 +366,8 @@ class Balance {
'tip_sent' => __('打赏支出', 'aksrt'), 'tip_sent' => __('打赏支出', 'aksrt'),
'tip_received' => __('收到打赏', 'aksrt'), 'tip_received' => __('收到打赏', 'aksrt'),
'admin' => __('管理员调整', 'aksrt'), 'admin' => __('管理员调整', 'aksrt'),
'exchange_from_credits' => __('积分兑换', 'aksrt'), 'points_exchange_out' => __('余额兑换积分', 'aksrt'),
'points_exchange_refund' => __('余额兑换积分退款', 'aksrt'),
'creator_income' => __('创作收益结算', 'aksrt'), 'creator_income' => __('创作收益结算', 'aksrt'),
'rebate' => __('推广返佣结算', 'aksrt'), 'rebate' => __('推广返佣结算', 'aksrt'),
'withdraw_hold' => __('提现冻结', 'aksrt'), 'withdraw_hold' => __('提现冻结', 'aksrt'),
-1
View File
@@ -10,7 +10,6 @@ defined('ABSPATH') || exit;
class BalanceService { class BalanceService {
use BalanceServiceRest; use BalanceServiceRest;
use BalanceServiceCharge; use BalanceServiceCharge;
use BalanceServicePoints;
private static $instance = null; private static $instance = null;
-73
View File
@@ -30,74 +30,6 @@ trait BalanceServiceCharge {
return; return;
} }
// Points purchase fulfill (zibll order_type=9).
if ($type === \AKSRT\Core\DomainModel::ORDER_PRODUCT_POINTS_BUY) {
if (!class_exists('AKSRT\\Credits\\Credits')) {
return;
}
$note = json_decode((string) ($order['note'] ?? ''), true);
if (!is_array($note)) {
$note = [];
}
if (!empty($note['points_credited'])) {
return;
}
$rate = 100;
if (class_exists('\AKSRT\Settings\Settings')) {
$rate = max(1, (int) (\AKSRT\Settings\Settings::get_all()['points_rate'] ?? 100));
}
$points = isset($note['points_amount'])
? (int) $note['points_amount']
: (int) round((float) ($order['amount'] ?? 0) * $rate);
if ($points <= 0) {
return;
}
global $wpdb;
if ($wpdb->query('START TRANSACTION') === false) {
return;
}
$add = Credits::add(
$user_id,
$points,
'points_buy',
['type' => 'order', 'order' => $order_number],
sprintf(__('购买积分订单 %s', 'aksrt'), $order_number),
false
);
if (is_wp_error($add)) {
$wpdb->query('ROLLBACK');
return;
}
$note['points_credited'] = 1;
$note['credited_points'] = $points;
$updated = $wpdb->update(
$wpdb->prefix . 'aksrt_order',
['note' => wp_json_encode($note, JSON_UNESCAPED_UNICODE | JSON_UNESCAPED_SLASHES)],
['order_number' => $order_number],
['%s'],
['%s']
);
if ($updated === false) {
$wpdb->query('ROLLBACK');
wp_cache_delete($user_id, 'user_meta');
return;
}
if ($wpdb->query('COMMIT') === false) {
$wpdb->query('ROLLBACK');
wp_cache_delete($user_id, 'user_meta');
return;
}
do_action('aksrt_credits_added', $user_id, $points, 'points_buy', (int) $add);
if (class_exists('\AKSRT\Payment\OrderRepository')) {
\AKSRT\Payment\OrderRepository::get_instance()->update_status(
$order_number,
\AKSRT\Payment\Order::STATUS_COMPLETED,
['note' => __('购买积分已到账。', 'aksrt')]
);
}
return;
}
if ($type !== \AKSRT\Core\DomainModel::ORDER_PRODUCT_RECHARGE) { if ($type !== \AKSRT\Core\DomainModel::ORDER_PRODUCT_RECHARGE) {
return; return;
} }
@@ -204,11 +136,6 @@ trait BalanceServiceCharge {
'service_charge' => (int) ($cfg['transfer']['service_charge'] ?? 0), 'service_charge' => (int) ($cfg['transfer']['service_charge'] ?? 0),
'desc' => (string) ($cfg['transfer']['desc'] ?? ''), 'desc' => (string) ($cfg['transfer']['desc'] ?? ''),
], ],
'exchange' => [
'enabled' => !empty($cfg['exchange']['enabled']),
'rate' => (int) ($cfg['exchange']['rate'] ?? 100),
'desc' => (string) ($cfg['exchange']['desc'] ?? ''),
],
'pass_charge' => is_array($cfg['pass_charge'] ?? null) ? $cfg['pass_charge'] : [], 'pass_charge' => is_array($cfg['pass_charge'] ?? null) ? $cfg['pass_charge'] : [],
]; ];
} }
-241
View File
@@ -1,241 +0,0 @@
<?php
/**
* @package AKSRT
*/
namespace AKSRT\Credits;
defined('ABSPATH') || exit;
trait BalanceServicePoints {
public function points_buy_enabled(): bool {
if (!class_exists('\AKSRT\Settings\Settings') || !\AKSRT\Settings\Settings::credits_enabled()) {
return false;
}
$all = \AKSRT\Settings\Settings::get_all();
return !empty($all['points_pay_s']);
}
/**
* @return array<string,mixed>
*/
public function get_points_buy_view(int $user_id): array {
$all = class_exists('\AKSRT\Settings\Settings') ? \AKSRT\Settings\Settings::get_all() : [];
$rate = max(1, (int) ($all['points_rate'] ?? 100));
$packages_raw = (string) ($all['pay_points_product'] ?? '');
$packages = $this->parse_points_packages($packages_raw);
$custom_s = !isset($all['pay_points_product_custom_s']) || !empty($all['pay_points_product_custom_s']);
$custom_limit = max(1, (int) ($all['pay_points_product_custom_limit'] ?? 99999));
$methods = [];
if (function_exists('aksrt_list_cash_payment_methods')) {
foreach (aksrt_list_cash_payment_methods(true) as $m) {
$id = is_array($m) ? (string) ($m['id'] ?? '') : (string) $m;
if ($id === '') {
continue;
}
if ($id === 'balance' && !(class_exists('AKSRT\\Credits\\Balance') && Balance::enabled())) {
continue;
}
$methods[] = is_array($m) ? $m : ['id' => $id, 'name' => $id];
}
}
if (class_exists('AKSRT\\Credits\\Balance') && Balance::enabled()) {
$has_bal = false;
foreach ($methods as $m) {
if (($m['id'] ?? '') === 'balance') {
$has_bal = true;
break;
}
}
if (!$has_bal) {
array_unshift($methods, ['id' => 'balance', 'name' => __('站内余额', 'aksrt')]);
}
}
return [
'enabled' => $this->points_buy_enabled(),
'desc' => (string) ($all['pay_points_desc'] ?? ''),
'rate' => $rate,
'points' => class_exists('AKSRT\\Credits\\Credits') ? Credits::balance($user_id) : 0,
'packages' => $packages,
'custom_s' => $custom_s,
'custom_limit' => $custom_limit,
'payment_methods' => $methods,
];
}
/**
* @return array<int,array{key:string,points:int,pay_price:float,title:string}>
*/
public function parse_points_packages(string $raw): array {
$out = [];
$lines = preg_split('/\r\n|\r|\n/', $raw) ?: [];
$i = 0;
foreach ($lines as $line) {
$line = trim((string) $line);
if ($line === '') {
continue;
}
// 支付金额|积分数量|标题
$parts = array_map('trim', explode('|', $line));
if (count($parts) < 2) {
continue;
}
$pay = (float) $parts[0];
$points = (int) $parts[1];
$title = $parts[2] ?? '';
if ($pay <= 0 || $points <= 0) {
continue;
}
$out[] = [
'key' => (string) $i,
'pay_price' => round($pay, 2),
'points' => $points,
'title' => $title !== '' ? $title : sprintf(__('%d 积分', 'aksrt'), $points),
];
$i++;
}
return $out;
}
/**
* @return array<string,mixed>|\WP_Error
*/
public function create_points_buy_order(int $user_id, string $package_key, int $custom_points, string $payment_method) {
if ($user_id <= 0) {
return new \WP_Error('aksrt_need_login', __('请先登录', 'aksrt'), ['status' => 401]);
}
if (!class_exists('\AKSRT\Payment\OrderRepository') || !class_exists('\AKSRT\Payment\Order')) {
return new \WP_Error('aksrt_pay_unavailable', __('订单系统不可用', 'aksrt'), ['status' => 500]);
}
$view = $this->get_points_buy_view($user_id);
$rate = max(1, (int) ($view['rate'] ?? 100));
$points_amount = 0;
$pay_amount = 0.0;
$title = __('购买积分', 'aksrt');
if ($package_key === 'custom' || $package_key === '') {
if (empty($view['custom_s'])) {
return new \WP_Error('aksrt_custom_closed', __('未开放自定义数量', 'aksrt'), ['status' => 400]);
}
$custom_points = max(0, $custom_points);
$max = (int) ($view['custom_limit'] ?? 99999);
if ($custom_points < $rate || $custom_points > $max) {
return new \WP_Error('aksrt_custom_limit', sprintf(__('购买积分需在 %d ~ %d 之间', 'aksrt'), $rate, $max), ['status' => 400]);
}
$points_amount = $custom_points;
$pay_amount = round($custom_points / $rate, 2);
if ($pay_amount <= 0) {
$pay_amount = 0.01;
}
$title = sprintf(__('购买 %d 积分', 'aksrt'), $points_amount);
$package_key = 'custom';
} else {
$found = null;
foreach ((array) $view['packages'] as $pkg) {
if ((string) ($pkg['key'] ?? '') === (string) $package_key) {
$found = $pkg;
break;
}
}
if (!$found) {
return new \WP_Error('aksrt_invalid_package', __('积分套餐无效', 'aksrt'), ['status' => 400]);
}
$points_amount = (int) $found['points'];
$pay_amount = (float) $found['pay_price'];
$title = (string) $found['title'];
}
if ($points_amount <= 0 || $pay_amount <= 0) {
return new \WP_Error('aksrt_invalid_price', __('金额无效', 'aksrt'), ['status' => 400]);
}
$payment_method = sanitize_key($payment_method);
if ($payment_method === '') {
$methods = $view['payment_methods'] ?? [];
$payment_method = !empty($methods[0]['id']) ? (string) $methods[0]['id'] : 'alipay';
}
$note = wp_json_encode([
'points_buy' => 1,
'package' => $package_key,
'points_amount' => $points_amount,
'pay_amount' => $pay_amount,
'title' => $title,
], JSON_UNESCAPED_UNICODE | JSON_UNESCAPED_SLASHES);
$order_number = \AKSRT\Payment\OrderRepository::get_instance()->create([
'user_id' => $user_id,
'product_type' => \AKSRT\Core\DomainModel::ORDER_PRODUCT_POINTS_BUY,
'product_id' => 0,
'amount' => $pay_amount,
'currency' => 'CNY',
'status' => \AKSRT\Payment\Order::STATUS_PENDING,
'payment_method' => $payment_method,
'note' => is_string($note) ? $note : '',
'expires_at' => \AKSRT\Settings\PaymentRuntime::get_order_expiry_at(),
]);
if ($order_number === '') {
return new \WP_Error('aksrt_order_create_failed', __('创建订单失败', 'aksrt'), ['status' => 500]);
}
$order = \AKSRT\Payment\OrderRepository::get_instance()->get($order_number);
if (!$order) {
return new \WP_Error('aksrt_order_create_failed', __('创建订单失败', 'aksrt'), ['status' => 500]);
}
$order['subject'] = $title;
$order['payment_method'] = $payment_method;
if (!class_exists('\AKSRT\Payment\Gateway')) {
return new \WP_Error('aksrt_pay_unavailable', __('支付网关不可用', 'aksrt'), ['status' => 500]);
}
$resolved = \AKSRT\Payment\PaymentOrchestrator::resolve_gateway($payment_method);
if (empty($resolved['gateway'])) {
return new \WP_Error(
(string) ($resolved['error_code'] ?? 'aksrt_gateway_unavailable'),
(string) ($resolved['message'] ?? __('当前支付方式不可用', 'aksrt')),
['status' => 400, 'order_number' => $order_number]
);
}
$payment_result = \AKSRT\Payment\PaymentOrchestrator::pay($resolved['gateway'], $order, [
'paid_note' => __('购买积分支付完成', 'aksrt'),
]);
if (empty($payment_result['success'])) {
return new \WP_Error(
(string) ($payment_result['code'] ?? 'aksrt_pay_failed'),
(string) ($payment_result['message'] ?? __('支付失败', 'aksrt')),
['status' => 402, 'order_number' => $order_number]
);
}
if (!empty($payment_result['redirect'])) {
return [
'redirect' => true,
'payment_url' => (string) ($payment_result['payment_url'] ?? ''),
'qr_content' => (string) ($payment_result['qr_content'] ?? ''),
'order_number' => $order_number,
'amount' => $pay_amount,
'points_amount' => $points_amount,
'message' => $payment_result['message'],
'reload' => false,
'poll' => true,
];
}
// PaymentOrchestrator's paid transition already dispatched the fulfillment hook.
return [
'redirect' => false,
'order_number' => $order_number,
'amount' => $pay_amount,
'points_amount' => $points_amount,
'points' => Credits::balance($user_id),
'message' => __('购买成功', 'aksrt'),
'reload' => true,
];
}
}
+83 -100
View File
@@ -49,27 +49,10 @@ trait BalanceServiceRest {
], ],
]); ]);
register_rest_route('aksrt/v1', '/pay/balance/exchange', [ register_rest_route('aksrt/v1', '/pay/balance/points-exchange', [
[ [
'methods' => \WP_REST_Server::CREATABLE, 'methods' => \WP_REST_Server::CREATABLE,
'callback' => [$this, 'rest_exchange_from_credits'], 'callback' => [$this, 'rest_exchange_balance_for_points'],
'permission_callback' => static function () {
return is_user_logged_in();
},
],
]);
register_rest_route('aksrt/v1', '/pay/points/buy', [
[
'methods' => \WP_REST_Server::READABLE,
'callback' => [$this, 'rest_points_buy_options'],
'permission_callback' => static function () {
return is_user_logged_in();
},
],
[
'methods' => \WP_REST_Server::CREATABLE,
'callback' => [$this, 'rest_points_buy_create'],
'permission_callback' => static function () { 'permission_callback' => static function () {
return is_user_logged_in(); return is_user_logged_in();
}, },
@@ -208,21 +191,28 @@ trait BalanceServiceRest {
} }
// points transfer // points transfer
$points_transfer_on = !empty(\AKSRT\Settings\Settings::get_all()['points_transfer_s']); if (!class_exists('\AKSRT\Settings\Settings') || !\AKSRT\Settings\Settings::credits_enabled()) {
if (!class_exists('\AKSRT\Settings\Settings') || !\AKSRT\Settings\Settings::credits_enabled() || !$points_transfer_on) { return new \WP_Error('aksrt_transfer_closed', __('积分转账未开启', 'aksrt'), ['status' => 403]);
}
$points_settings = \AKSRT\Settings\Settings::get_all();
if (empty($points_settings['points_transfer_s'])) {
return new \WP_Error('aksrt_transfer_closed', __('积分转账未开启', 'aksrt'), ['status' => 403]); return new \WP_Error('aksrt_transfer_closed', __('积分转账未开启', 'aksrt'), ['status' => 403]);
} }
if (class_exists('\AKSRT\Settings\Capabilities') && !\AKSRT\Settings\Capabilities::user_can('points_transfer', $from_id)) { if (class_exists('\AKSRT\Settings\Capabilities') && !\AKSRT\Settings\Capabilities::user_can('points_transfer', $from_id)) {
return new \WP_Error('aksrt_transfer_forbidden', __('当前账号无权转账积分', 'aksrt'), ['status' => 403]); return new \WP_Error('aksrt_transfer_forbidden', __('当前账号无权转账积分', 'aksrt'), ['status' => 403]);
} }
$amount = (int) $amount_raw; if (filter_var($amount_raw, FILTER_VALIDATE_INT) === false || (int) $amount_raw <= 0) {
if ($amount <= 0) {
return new \WP_Error('aksrt_transfer_amount', __('请输入有效积分', 'aksrt'), ['status' => 400]); return new \WP_Error('aksrt_transfer_amount', __('请输入有效积分', 'aksrt'), ['status' => 400]);
} }
$amount = (int) $amount_raw;
$min_amount = max(1, (int) ($points_settings['points_transfer_min'] ?? 1));
if ($amount < $min_amount) {
return new \WP_Error('aksrt_transfer_minimum', sprintf(__('单笔转账至少需要 %d 积分', 'aksrt'), $min_amount), ['status' => 400]);
}
if (!class_exists('AKSRT\\Credits\\Credits')) { if (!class_exists('AKSRT\\Credits\\Credits')) {
return new \WP_Error('aksrt_credits_unavailable', __('积分系统不可用', 'aksrt'), ['status' => 500]); return new \WP_Error('aksrt_credits_unavailable', __('积分系统不可用', 'aksrt'), ['status' => 500]);
} }
$fee_rate = max(0, min(50, (int) (\AKSRT\Settings\Settings::get_all()['points_service_charge'] ?? 0))); $fee_rate = max(0, min(50, (int) ($points_settings['points_service_charge'] ?? 0)));
$credit = $fee_rate > 0 ? (int) floor($amount * (100 - $fee_rate) / 100) : $amount; $credit = $fee_rate > 0 ? (int) floor($amount * (100 - $fee_rate) / 100) : $amount;
$from_user = wp_get_current_user(); $from_user = wp_get_current_user();
$to_user = get_userdata($recipient); $to_user = get_userdata($recipient);
@@ -236,13 +226,26 @@ trait BalanceServiceRest {
if (is_wp_error($deduct)) { if (is_wp_error($deduct)) {
return $deduct; return $deduct;
} }
Credits::add( $add = Credits::add(
$recipient, $recipient,
$credit, $credit,
'transfer_in', 'transfer_in',
['type' => 'user', 'id' => $from_id], ['type' => 'user', 'id' => $from_id],
sprintf(__('来自用户[%s]的转账', 'aksrt'), $from_user->display_name ?: (string) $from_id) sprintf(__('来自用户[%s]的转账', 'aksrt'), $from_user->display_name ?: (string) $from_id)
); );
if (is_wp_error($add)) {
$refund = Credits::add(
$from_id,
$amount,
'transfer_refund',
['type' => 'user', 'id' => $recipient],
__('收款积分入账失败,已退回转账积分', 'aksrt')
);
if (is_wp_error($refund)) {
return new \WP_Error('aksrt_transfer_recovery_failed', __('收款积分入账失败,转账积分退回失败,请联系管理员', 'aksrt'), ['status' => 500]);
}
return $add;
}
return rest_ensure_response([ return rest_ensure_response([
'success' => true, 'success' => true,
'data' => [ 'data' => [
@@ -283,102 +286,82 @@ trait BalanceServiceRest {
/** /**
* Exchange points → cash wallet (pay_balance_exchange_*). * Exchange integer cash-wallet balance for points.
*/ */
public function rest_exchange_from_credits(\WP_REST_Request $request) { public function rest_exchange_balance_for_points(\WP_REST_Request $request) {
if (!class_exists('AKSRT\\Credits\\Balance') || !Balance::enabled()) { if (!class_exists('AKSRT\\Credits\\Balance') || !Balance::enabled()) {
return new \WP_Error('aksrt_balance_disabled', __('余额功能未启用', 'aksrt'), ['status' => 403]); return new \WP_Error('aksrt_balance_disabled', __('余额功能未启用', 'aksrt'), ['status' => 403]);
} }
$cfg = class_exists('\AKSRT\Settings\Settings') ? \AKSRT\Settings\Settings::get_payment_recharge_settings() : []; if (!class_exists('AKSRT\\Credits\\Credits') || !class_exists('AKSRT\\Settings\\Settings') || !\AKSRT\Settings\Settings::credits_enabled()) {
if (empty($cfg['exchange']['enabled'])) {
return new \WP_Error('aksrt_exchange_closed', __('积分兑换余额未开启', 'aksrt'), ['status' => 403]);
}
if (!class_exists('AKSRT\\Credits\\Credits') || !\AKSRT\Settings\Settings::credits_enabled()) {
return new \WP_Error('aksrt_credits_disabled', __('积分功能未启用', 'aksrt'), ['status' => 403]); return new \WP_Error('aksrt_credits_disabled', __('积分功能未启用', 'aksrt'), ['status' => 403]);
} }
$cfg = \AKSRT\Settings\Settings::get_payment_recharge_settings();
$exchange = is_array($cfg['points_exchange'] ?? null) ? $cfg['points_exchange'] : [];
if (empty($exchange['enabled'])) {
return new \WP_Error('aksrt_exchange_closed', __('余额兑换积分未开启', 'aksrt'), ['status' => 403]);
}
$params = $request->get_json_params(); $params = $request->get_json_params();
if (!is_array($params)) { if (!is_array($params)) {
$params = $request->get_params(); $params = $request->get_params();
} }
$points = (int) ($params['points'] ?? 0); $raw_amount = $params['amount'] ?? 0;
$rate = max(1, (int) ($cfg['exchange']['rate'] ?? 100)); // N points = 1 yuan if (filter_var($raw_amount, FILTER_VALIDATE_INT) === false || (int) $raw_amount <= 0) {
if ($points < $rate) { return new \WP_Error('aksrt_exchange_amount', __('兑换余额必须为正整数', 'aksrt'), ['status' => 400]);
return new \WP_Error('aksrt_exchange_min', sprintf(__('最少兑换 %d 积分', 'aksrt'), $rate), ['status' => 400]);
} }
// Floor to whole yuan. $amount = (int) $raw_amount;
$yuan = (int) floor($points / $rate); $rate = max(1, (int) ($exchange['rate'] ?? 100));
$cost = $yuan * $rate; $daily_max = max(1, (int) ($exchange['daily_max_points'] ?? 100000));
if ($yuan <= 0 || $cost <= 0) { if ($amount > intdiv($daily_max, $rate)) {
return new \WP_Error('aksrt_exchange_amount', __('兑换数量无效', 'aksrt'), ['status' => 400]); return new \WP_Error('aksrt_exchange_daily_limit', sprintf(__('今日购买积分上限为 %d', 'aksrt'), $daily_max), ['status' => 400]);
}
$points = $amount * $rate;
$min_points = max(1, (int) ($exchange['min_points'] ?? 100));
if ($points < $min_points) {
return new \WP_Error('aksrt_exchange_min', sprintf(__('单笔至少购买 %d 积分', 'aksrt'), $min_points), ['status' => 400]);
} }
$user_id = get_current_user_id(); $user_id = get_current_user_id();
$deduct = Credits::deduct( $today_points = $this->today_points_exchange_total($user_id);
$user_id, if ($today_points + $points > $daily_max) {
$cost, return new \WP_Error('aksrt_exchange_daily_limit', sprintf(__('今日购买积分上限为 %d,当前还可购买 %d', 'aksrt'), $daily_max, max(0, $daily_max - $today_points)), ['status' => 400]);
'exchange_to_balance',
['type' => 'balance'],
sprintf(__('积分兑换余额 %d 元', 'aksrt'), $yuan)
);
if (is_wp_error($deduct)) {
return $deduct;
} }
$add = Balance::add( try {
$user_id, $exchange_ref = random_int(1, PHP_INT_MAX);
(float) $yuan, } catch (\Throwable $e) {
'exchange_from_credits', $exchange_ref = (int) round(microtime(true) * 1000000);
['type' => 'credits'], }
sprintf(__('积分兑换:消耗 %d 积分', 'aksrt'), $cost) $ref = ['type' => 'points_exchange', 'id' => $exchange_ref];
); $deduct = Balance::deduct($user_id, (float) $amount, 'points_exchange_out', $ref, sprintf(__('余额兑换 %d 积分', 'aksrt'), $points));
if (is_wp_error($deduct)) return $deduct;
$add = Credits::add($user_id, $points, 'points_exchange_in', $ref, sprintf(__('余额兑换:扣除 %d 余额', 'aksrt'), $amount));
if (is_wp_error($add)) { if (is_wp_error($add)) {
// best-effort refund points $refund = Balance::add($user_id, (float) $amount, 'points_exchange_refund', $ref, __('积分入账失败,已退回兑换余额', 'aksrt'));
Credits::add($user_id, $cost, 'exchange_refund', [], __('兑换失败退回积分', 'aksrt')); if (is_wp_error($refund)) return new \WP_Error('aksrt_exchange_recovery_failed', __('积分入账失败,余额退回失败,请联系管理员', 'aksrt'), ['status' => 500]);
return $add; return $add;
} }
return rest_ensure_response([ return rest_ensure_response(['success' => true, 'data' => [
'success' => true, 'message' => sprintf(__('兑换成功,获得 %d 积分', 'aksrt'), $points),
'data' => [ 'wallet_balance' => Balance::balance($user_id),
'message' => sprintf(__('兑换成功:+%d 元', 'aksrt'), $yuan), 'credit_balance' => Credits::balance($user_id),
'wallet_balance' => Balance::balance($user_id), 'points' => $points,
'credit_balance' => Credits::balance($user_id), 'reload' => true,
'reload' => true, ]]);
],
]);
} }
private function today_points_exchange_total(int $user_id): int {
if ($user_id <= 0 || !class_exists('AKSRT\\Core\\DBMigrator')) return 0;
public function rest_points_buy_options(\WP_REST_Request $request) { global $wpdb;
if (!$this->points_buy_enabled()) { $table = \AKSRT\Core\DBMigrator::table('credit_log');
return new \WP_Error('aksrt_points_buy_disabled', __('购买积分未开启', 'aksrt'), ['status' => 403]); if ($table === '') return 0;
} $site_now = current_datetime();
return rest_ensure_response([ $start = (clone $site_now)->setTime(0, 0, 0);
'success' => true, $end = (clone $start)->modify('+1 day');
'data' => $this->get_points_buy_view(get_current_user_id()), $utc = new \DateTimeZone('UTC');
]); $sql = "SELECT COALESCE(SUM(delta), 0) FROM {$table} WHERE user_id = %d AND reason = %s AND created_at >= %s AND created_at < %s";
$start_gmt = $start->setTimezone($utc)->format('Y-m-d H:i:s');
$end_gmt = $end->setTimezone($utc)->format('Y-m-d H:i:s');
return max(0, (int) $wpdb->get_var($wpdb->prepare($sql, $user_id, 'points_exchange_in', $start_gmt, $end_gmt)));
} }
public function rest_points_buy_create(\WP_REST_Request $request) {
if (!$this->points_buy_enabled()) {
return new \WP_Error('aksrt_points_buy_disabled', __('购买积分未开启', 'aksrt'), ['status' => 403]);
}
$params = $request->get_json_params();
if (!is_array($params)) {
$params = $request->get_params();
}
$package_key = sanitize_text_field((string) ($params['package'] ?? 'custom'));
$custom_points = (int) ($params['custom_points'] ?? $params['points'] ?? 0);
$payment_method = sanitize_key((string) ($params['payment_method'] ?? 'alipay'));
$result = $this->create_points_buy_order(get_current_user_id(), $package_key, $custom_points, $payment_method);
if (is_wp_error($result)) {
return $result;
}
return rest_ensure_response(['success' => true, 'data' => $result]);
}
public function rest_balance_withdraw(\WP_REST_Request $request) { public function rest_balance_withdraw(\WP_REST_Request $request) {
if (!class_exists('AKSRT\\Credits\\Balance') || !Balance::enabled()) { if (!class_exists('AKSRT\\Credits\\Balance') || !Balance::enabled()) {
return new \WP_Error('aksrt_balance_disabled', __('余额功能未启用', 'aksrt'), ['status' => 403]); return new \WP_Error('aksrt_balance_disabled', __('余额功能未启用', 'aksrt'), ['status' => 403]);
+1 -5
View File
@@ -313,9 +313,6 @@ class UserOrders {
if ($type === DomainModel::ORDER_PRODUCT_RECHARGE) { if ($type === DomainModel::ORDER_PRODUCT_RECHARGE) {
return __('余额充值', 'aksrt'); return __('余额充值', 'aksrt');
} }
if ($type === DomainModel::ORDER_PRODUCT_POINTS_BUY) {
return __('购买积分', 'aksrt');
}
if ($product_id > 0) { if ($product_id > 0) {
$cache_key = (string) $product_id; $cache_key = (string) $product_id;
if (!array_key_exists($cache_key, $this->post_title_cache)) { if (!array_key_exists($cache_key, $this->post_title_cache)) {
@@ -357,7 +354,7 @@ class UserOrders {
if ($type === DomainModel::ORDER_PRODUCT_VIP) { if ($type === DomainModel::ORDER_PRODUCT_VIP) {
$url = function_exists('aksrt_get_user_center_tab_url') ? aksrt_get_user_center_tab_url('vip') : ''; $url = function_exists('aksrt_get_user_center_tab_url') ? aksrt_get_user_center_tab_url('vip') : '';
} elseif (in_array($type, [DomainModel::ORDER_PRODUCT_RECHARGE, DomainModel::ORDER_PRODUCT_POINTS_BUY], true)) { } elseif ($type === DomainModel::ORDER_PRODUCT_RECHARGE) {
$url = function_exists('aksrt_get_user_center_tab_url') ? aksrt_get_user_center_tab_url('credits') : ''; $url = function_exists('aksrt_get_user_center_tab_url') ? aksrt_get_user_center_tab_url('credits') : '';
} else { } else {
$url = $post_id > 0 ? get_permalink($post_id) : ''; $url = $post_id > 0 ? get_permalink($post_id) : '';
@@ -371,7 +368,6 @@ class UserOrders {
return match ($type) { return match ($type) {
DomainModel::ORDER_PRODUCT_VIP => __('查看会员权益', 'aksrt'), DomainModel::ORDER_PRODUCT_VIP => __('查看会员权益', 'aksrt'),
DomainModel::ORDER_PRODUCT_RECHARGE => __('查看余额', 'aksrt'), DomainModel::ORDER_PRODUCT_RECHARGE => __('查看余额', 'aksrt'),
DomainModel::ORDER_PRODUCT_POINTS_BUY => __('查看积分', 'aksrt'),
default => __('打开已购内容', 'aksrt'), default => __('打开已购内容', 'aksrt'),
}; };
} }
+6 -4
View File
@@ -110,10 +110,12 @@ class PaymentRuntime {
'desc' => sanitize_textarea_field((string) ($settings['pay_balance_pass_charge_desc'] ?? '')), 'desc' => sanitize_textarea_field((string) ($settings['pay_balance_pass_charge_desc'] ?? '')),
'only_password' => !empty($settings['pay_balance_pass_charge_only_password']), 'only_password' => !empty($settings['pay_balance_pass_charge_only_password']),
], ],
'exchange' => [ 'points_exchange' => [
'enabled' => !empty($settings['pay_balance_exchange_s']), 'enabled' => !empty($settings['pay_balance_points_exchange_s']),
'rate' => max(1, min(10000, (int) ($settings['pay_balance_exchange_rate'] ?? 100))), 'rate' => max(1, min(10000, (int) ($settings['pay_balance_points_exchange_rate'] ?? 100))),
'desc' => sanitize_textarea_field((string) ($settings['pay_balance_exchange_desc'] ?? '')), 'min_points' => max(1, min(10000000, (int) ($settings['pay_balance_points_exchange_min_points'] ?? 100))),
'daily_max_points' => max(1, min(10000000, (int) ($settings['pay_balance_points_exchange_daily_max_points'] ?? 100000))),
'desc' => sanitize_textarea_field((string) ($settings['pay_balance_points_exchange_desc'] ?? '')),
], ],
]; ];
} }