fix(admin): 兼容提现金额历史配置

This commit is contained in:
2026-09-16 14:12:40 +08:00
parent bcba58f227
commit e7ffb44b45
2 changed files with 45 additions and 15 deletions
+33 -15
View File
@@ -175,12 +175,7 @@ class SchemaProvider {
continue;
}
if (($field['sanitize_type'] ?? '') === 'money_decimal') {
try {
if (!is_string($value)) {
throw new \InvalidArgumentException('money_decimal_must_be_string');
}
\AKSRT\Ledger\AssetAmount::balance(trim($value));
} catch (\InvalidArgumentException $e) {
if ($this->normalize_money_decimal($value) === '') {
$errors[] = sprintf('%s must be a decimal string with at most two fractional digits', $field['label'] ?? $key);
continue;
}
@@ -543,6 +538,12 @@ class SchemaProvider {
if (array_key_exists($field['key'], $stored)) {
$data[$field['key']] = $stored[$field['key']];
}
if (($field['sanitize_type'] ?? '') === 'money_decimal' && array_key_exists($field['key'], $data)) {
$normalized = $this->normalize_money_decimal($data[$field['key']]);
if ($normalized !== '') {
$data[$field['key']] = $normalized;
}
}
$stored_value = array_key_exists($field['key'], $stored) ? $stored[$field['key']] : ($data[$field['key']] ?? '');
@@ -748,7 +749,31 @@ class SchemaProvider {
return $fields;
}
private function sanitize_value($value, string $type) {
/**
* Normalize legacy numeric money settings without accepting lossy precision.
*
* @param mixed $value
*/
private function normalize_money_decimal($value): string {
if (is_int($value)) {
$value = (string) $value;
} elseif (is_float($value)) {
if (!is_finite($value)) {
return '';
}
$value = (string) $value;
} elseif (!is_string($value)) {
return '';
}
try {
return \AKSRT\Ledger\AssetAmount::balance(trim($value))->decimal();
} catch (\InvalidArgumentException $e) {
return '';
}
}
private function sanitize_value($value, string $type) {
switch ($type) {
case 'attachment_ids':
if (!is_array($value)) {
@@ -771,14 +796,7 @@ class SchemaProvider {
case 'float':
return (float) $value;
case 'money_decimal':
if (!is_string($value)) {
return '';
}
try {
return \AKSRT\Ledger\AssetAmount::balance(trim($value))->decimal();
} catch (\InvalidArgumentException $e) {
return '';
}
return $this->normalize_money_decimal($value);
case 'array':
// 深层字符串净化,保留嵌套服务商配置(如 geetest.captcha_id)
if (!is_array($value)) {
@@ -11,6 +11,7 @@ const styles = read('assets/admin/src/style.css')
const field = read('assets/admin/src/components/form/AksField.vue')
const fieldGroup = read('assets/admin/src/components/form/AksFieldGroup.vue')
const formRenderer = read('assets/admin/src/components/form/AksFormRenderer.vue')
const schemaProvider = read('src/Admin/SchemaProvider.php')
test('admin theme exposes the approved white, grey, and green tokens', () => {
const requiredTokens = {
@@ -63,6 +64,17 @@ test('navigation, focus, responsive layout, and reduced motion are contracted',
assert.match(styles, /@media \(prefers-reduced-motion:\s*reduce\)/)
})
test('money decimal settings normalize legacy numeric values before validation', () => {
assert.match(schemaProvider, /private function normalize_money_decimal\(\$value\): string/)
assert.match(schemaProvider, /if \(is_int\(\$value\)\)/)
assert.match(schemaProvider, /is_finite\(\$value\)/)
assert.match(schemaProvider, /AssetAmount::balance\(trim\(\$value\)\)->decimal\(\)/)
assert.match(schemaProvider, /sanitize_type.*money_decimal[\s\S]*?normalize_money_decimal\(\$data\[\$field\['key'\]\]\)/)
assert.match(schemaProvider, /sanitize_type.*money_decimal[\s\S]*?normalize_money_decimal\(\$value\)/)
assert.match(read('assets/admin/src/schema/sections/payment/withdrawal.js'), /affiliate_min_withdrawal: '50\.00'/)
assert.match(read('assets/admin/src/schema/sections/payment/withdrawal.js'), /affiliate_daily_withdrawal_limit: '500\.00'/)
})
test('captcha scene whitelist matches both admin schemas and excludes dead email verification', () => {
const captcha = read('inc/modules/captcha.php')
const phpSchema = read('src/Admin/Schema/SchemaPermissions.php')