2025-07-19 03:30:44 +08:00
|
|
|
|
/*
|
|
|
|
|
|
Copyright (C) 2025 QuantumNous
|
|
|
|
|
|
|
|
|
|
|
|
This program is free software: you can redistribute it and/or modify
|
|
|
|
|
|
it under the terms of the GNU Affero General Public License as
|
|
|
|
|
|
published by the Free Software Foundation, either version 3 of the
|
|
|
|
|
|
License, or (at your option) any later version.
|
|
|
|
|
|
|
|
|
|
|
|
This program is distributed in the hope that it will be useful,
|
|
|
|
|
|
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
|
|
|
|
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
|
|
|
|
GNU Affero General Public License for more details.
|
|
|
|
|
|
|
|
|
|
|
|
You should have received a copy of the GNU Affero General Public License
|
|
|
|
|
|
along with this program. If not, see <https://www.gnu.org/licenses/>.
|
|
|
|
|
|
|
|
|
|
|
|
For commercial licensing, please contact support@quantumnous.com
|
|
|
|
|
|
*/
|
|
|
|
|
|
|
2024-05-11 14:06:32 +08:00
|
|
|
|
import React, { useEffect, useState, useRef } from 'react';
|
✨ feat: Add topup billing history with admin manual completion
Implement comprehensive topup billing system with user history viewing and admin management capabilities.
## Features Added
### Frontend
- Add topup history modal with paginated billing records
- Display order details: trade number, payment method, amount, money, status, create time
- Implement empty state with proper illustrations
- Add payment method column with localized display (Stripe, Alipay, WeChat)
- Add admin manual completion feature for pending orders
- Add Coins icon for recharge amount display
- Integrate "Bills" button in RechargeCard header
- Optimize code quality by using shared utility functions (isAdmin)
- Extract constants for status and payment method mappings
- Use React.useMemo for performance optimization
### Backend
- Create GET `/api/user/topup/self` endpoint for user topup history with pagination
- Create POST `/api/user/topup/complete` endpoint for admin manual order completion
- Add `payment_method` field to TopUp model for tracking payment types
- Implement `GetUserTopUps` method with proper pagination and ordering
- Implement `ManualCompleteTopUp` with transaction safety and row-level locking
- Add application-level mutex locks to prevent concurrent order processing
- Record payment method in Epay and Stripe payment flows
- Ensure idempotency and data consistency with proper error handling
### Internationalization
- Add i18n keys for Chinese (zh), English (en), and French (fr)
- Support for billing-related UI text and status messages
## Technical Improvements
- Use database transactions with FOR UPDATE row-level locking
- Implement sync.Map-based mutex for order-level concurrency control
- Proper error handling and user-friendly toast notifications
- Follow existing codebase patterns for empty states and modals
- Maintain code quality with extracted render functions and constants
## Files Changed
- Backend: controller/topup.go, controller/topup_stripe.go, model/topup.go, router/api-router.go
- Frontend: web/src/components/topup/modals/TopupHistoryModal.jsx (new), web/src/components/topup/RechargeCard.jsx, web/src/components/topup/index.jsx
- i18n: web/src/i18n/locales/{zh,en,fr}.json
2025-10-07 00:22:45 +08:00
|
|
|
|
import {
|
|
|
|
|
|
Button,
|
|
|
|
|
|
Col,
|
|
|
|
|
|
Form,
|
|
|
|
|
|
Row,
|
|
|
|
|
|
Spin,
|
|
|
|
|
|
DatePicker,
|
|
|
|
|
|
Typography,
|
|
|
|
|
|
Modal,
|
|
|
|
|
|
} from '@douyinfe/semi-ui';
|
2024-05-11 14:06:32 +08:00
|
|
|
|
import dayjs from 'dayjs';
|
2024-12-13 19:03:14 +08:00
|
|
|
|
import { useTranslation } from 'react-i18next';
|
2024-05-11 14:06:32 +08:00
|
|
|
|
import {
|
|
|
|
|
|
compareObjects,
|
|
|
|
|
|
API,
|
|
|
|
|
|
showError,
|
|
|
|
|
|
showSuccess,
|
|
|
|
|
|
showWarning,
|
|
|
|
|
|
} from '../../../helpers';
|
|
|
|
|
|
|
2025-10-05 22:51:28 +08:00
|
|
|
|
const { Text } = Typography;
|
|
|
|
|
|
|
2024-05-11 14:06:32 +08:00
|
|
|
|
export default function SettingsLog(props) {
|
2024-12-13 19:03:14 +08:00
|
|
|
|
const { t } = useTranslation();
|
2024-05-11 14:06:32 +08:00
|
|
|
|
const [loading, setLoading] = useState(false);
|
|
|
|
|
|
const [loadingCleanHistoryLog, setLoadingCleanHistoryLog] = useState(false);
|
|
|
|
|
|
const [inputs, setInputs] = useState({
|
|
|
|
|
|
LogConsumeEnabled: false,
|
|
|
|
|
|
historyTimestamp: dayjs().subtract(1, 'month').toDate(),
|
|
|
|
|
|
});
|
|
|
|
|
|
const refForm = useRef();
|
|
|
|
|
|
const [inputsRow, setInputsRow] = useState(inputs);
|
|
|
|
|
|
|
|
|
|
|
|
function onSubmit() {
|
|
|
|
|
|
const updateArray = compareObjects(inputs, inputsRow).filter(
|
|
|
|
|
|
(item) => item.key !== 'historyTimestamp',
|
|
|
|
|
|
);
|
|
|
|
|
|
|
2024-12-13 19:03:14 +08:00
|
|
|
|
if (!updateArray.length) return showWarning(t('你似乎并没有修改什么'));
|
2024-05-11 14:06:32 +08:00
|
|
|
|
const requestQueue = updateArray.map((item) => {
|
|
|
|
|
|
let value = '';
|
|
|
|
|
|
if (typeof inputs[item.key] === 'boolean') {
|
|
|
|
|
|
value = String(inputs[item.key]);
|
|
|
|
|
|
} else {
|
|
|
|
|
|
value = inputs[item.key];
|
|
|
|
|
|
}
|
|
|
|
|
|
return API.put('/api/option/', {
|
|
|
|
|
|
key: item.key,
|
|
|
|
|
|
value,
|
|
|
|
|
|
});
|
|
|
|
|
|
});
|
|
|
|
|
|
setLoading(true);
|
|
|
|
|
|
Promise.all(requestQueue)
|
|
|
|
|
|
.then((res) => {
|
|
|
|
|
|
if (requestQueue.length === 1) {
|
|
|
|
|
|
if (res.includes(undefined)) return;
|
|
|
|
|
|
} else if (requestQueue.length > 1) {
|
2025-04-04 12:00:38 +08:00
|
|
|
|
if (res.includes(undefined))
|
|
|
|
|
|
return showError(t('部分保存失败,请重试'));
|
2024-05-11 14:06:32 +08:00
|
|
|
|
}
|
2024-12-13 19:03:14 +08:00
|
|
|
|
showSuccess(t('保存成功'));
|
2024-05-14 10:17:20 +08:00
|
|
|
|
props.refresh();
|
2024-05-11 14:06:32 +08:00
|
|
|
|
})
|
|
|
|
|
|
.catch(() => {
|
2024-12-13 19:03:14 +08:00
|
|
|
|
showError(t('保存失败,请重试'));
|
2024-05-11 14:06:32 +08:00
|
|
|
|
})
|
|
|
|
|
|
.finally(() => {
|
|
|
|
|
|
setLoading(false);
|
|
|
|
|
|
});
|
|
|
|
|
|
}
|
|
|
|
|
|
async function onCleanHistoryLog() {
|
2025-10-05 22:51:28 +08:00
|
|
|
|
if (!inputs.historyTimestamp) {
|
|
|
|
|
|
showError(t('请选择日志记录时间'));
|
|
|
|
|
|
return;
|
2024-05-11 14:06:32 +08:00
|
|
|
|
}
|
2025-10-05 22:51:28 +08:00
|
|
|
|
|
|
|
|
|
|
const now = dayjs();
|
|
|
|
|
|
const targetDate = dayjs(inputs.historyTimestamp);
|
|
|
|
|
|
const targetTime = targetDate.format('YYYY-MM-DD HH:mm:ss');
|
|
|
|
|
|
const currentTime = now.format('YYYY-MM-DD HH:mm:ss');
|
|
|
|
|
|
const daysDiff = now.diff(targetDate, 'day');
|
✨ feat: Add topup billing history with admin manual completion
Implement comprehensive topup billing system with user history viewing and admin management capabilities.
## Features Added
### Frontend
- Add topup history modal with paginated billing records
- Display order details: trade number, payment method, amount, money, status, create time
- Implement empty state with proper illustrations
- Add payment method column with localized display (Stripe, Alipay, WeChat)
- Add admin manual completion feature for pending orders
- Add Coins icon for recharge amount display
- Integrate "Bills" button in RechargeCard header
- Optimize code quality by using shared utility functions (isAdmin)
- Extract constants for status and payment method mappings
- Use React.useMemo for performance optimization
### Backend
- Create GET `/api/user/topup/self` endpoint for user topup history with pagination
- Create POST `/api/user/topup/complete` endpoint for admin manual order completion
- Add `payment_method` field to TopUp model for tracking payment types
- Implement `GetUserTopUps` method with proper pagination and ordering
- Implement `ManualCompleteTopUp` with transaction safety and row-level locking
- Add application-level mutex locks to prevent concurrent order processing
- Record payment method in Epay and Stripe payment flows
- Ensure idempotency and data consistency with proper error handling
### Internationalization
- Add i18n keys for Chinese (zh), English (en), and French (fr)
- Support for billing-related UI text and status messages
## Technical Improvements
- Use database transactions with FOR UPDATE row-level locking
- Implement sync.Map-based mutex for order-level concurrency control
- Proper error handling and user-friendly toast notifications
- Follow existing codebase patterns for empty states and modals
- Maintain code quality with extracted render functions and constants
## Files Changed
- Backend: controller/topup.go, controller/topup_stripe.go, model/topup.go, router/api-router.go
- Frontend: web/src/components/topup/modals/TopupHistoryModal.jsx (new), web/src/components/topup/RechargeCard.jsx, web/src/components/topup/index.jsx
- i18n: web/src/i18n/locales/{zh,en,fr}.json
2025-10-07 00:22:45 +08:00
|
|
|
|
|
2025-10-05 22:51:28 +08:00
|
|
|
|
Modal.confirm({
|
|
|
|
|
|
title: t('确认清除历史日志'),
|
|
|
|
|
|
content: (
|
|
|
|
|
|
<div style={{ lineHeight: '1.8' }}>
|
|
|
|
|
|
<p>
|
|
|
|
|
|
<Text>{t('当前时间')}:</Text>
|
✨ feat: Add topup billing history with admin manual completion
Implement comprehensive topup billing system with user history viewing and admin management capabilities.
## Features Added
### Frontend
- Add topup history modal with paginated billing records
- Display order details: trade number, payment method, amount, money, status, create time
- Implement empty state with proper illustrations
- Add payment method column with localized display (Stripe, Alipay, WeChat)
- Add admin manual completion feature for pending orders
- Add Coins icon for recharge amount display
- Integrate "Bills" button in RechargeCard header
- Optimize code quality by using shared utility functions (isAdmin)
- Extract constants for status and payment method mappings
- Use React.useMemo for performance optimization
### Backend
- Create GET `/api/user/topup/self` endpoint for user topup history with pagination
- Create POST `/api/user/topup/complete` endpoint for admin manual order completion
- Add `payment_method` field to TopUp model for tracking payment types
- Implement `GetUserTopUps` method with proper pagination and ordering
- Implement `ManualCompleteTopUp` with transaction safety and row-level locking
- Add application-level mutex locks to prevent concurrent order processing
- Record payment method in Epay and Stripe payment flows
- Ensure idempotency and data consistency with proper error handling
### Internationalization
- Add i18n keys for Chinese (zh), English (en), and French (fr)
- Support for billing-related UI text and status messages
## Technical Improvements
- Use database transactions with FOR UPDATE row-level locking
- Implement sync.Map-based mutex for order-level concurrency control
- Proper error handling and user-friendly toast notifications
- Follow existing codebase patterns for empty states and modals
- Maintain code quality with extracted render functions and constants
## Files Changed
- Backend: controller/topup.go, controller/topup_stripe.go, model/topup.go, router/api-router.go
- Frontend: web/src/components/topup/modals/TopupHistoryModal.jsx (new), web/src/components/topup/RechargeCard.jsx, web/src/components/topup/index.jsx
- i18n: web/src/i18n/locales/{zh,en,fr}.json
2025-10-07 00:22:45 +08:00
|
|
|
|
<Text strong style={{ color: '#52c41a' }}>
|
|
|
|
|
|
{currentTime}
|
|
|
|
|
|
</Text>
|
2025-10-05 22:51:28 +08:00
|
|
|
|
</p>
|
|
|
|
|
|
<p>
|
|
|
|
|
|
<Text>{t('选择时间')}:</Text>
|
✨ feat: Add topup billing history with admin manual completion
Implement comprehensive topup billing system with user history viewing and admin management capabilities.
## Features Added
### Frontend
- Add topup history modal with paginated billing records
- Display order details: trade number, payment method, amount, money, status, create time
- Implement empty state with proper illustrations
- Add payment method column with localized display (Stripe, Alipay, WeChat)
- Add admin manual completion feature for pending orders
- Add Coins icon for recharge amount display
- Integrate "Bills" button in RechargeCard header
- Optimize code quality by using shared utility functions (isAdmin)
- Extract constants for status and payment method mappings
- Use React.useMemo for performance optimization
### Backend
- Create GET `/api/user/topup/self` endpoint for user topup history with pagination
- Create POST `/api/user/topup/complete` endpoint for admin manual order completion
- Add `payment_method` field to TopUp model for tracking payment types
- Implement `GetUserTopUps` method with proper pagination and ordering
- Implement `ManualCompleteTopUp` with transaction safety and row-level locking
- Add application-level mutex locks to prevent concurrent order processing
- Record payment method in Epay and Stripe payment flows
- Ensure idempotency and data consistency with proper error handling
### Internationalization
- Add i18n keys for Chinese (zh), English (en), and French (fr)
- Support for billing-related UI text and status messages
## Technical Improvements
- Use database transactions with FOR UPDATE row-level locking
- Implement sync.Map-based mutex for order-level concurrency control
- Proper error handling and user-friendly toast notifications
- Follow existing codebase patterns for empty states and modals
- Maintain code quality with extracted render functions and constants
## Files Changed
- Backend: controller/topup.go, controller/topup_stripe.go, model/topup.go, router/api-router.go
- Frontend: web/src/components/topup/modals/TopupHistoryModal.jsx (new), web/src/components/topup/RechargeCard.jsx, web/src/components/topup/index.jsx
- i18n: web/src/i18n/locales/{zh,en,fr}.json
2025-10-07 00:22:45 +08:00
|
|
|
|
<Text strong type='danger'>
|
|
|
|
|
|
{targetTime}
|
|
|
|
|
|
</Text>
|
2025-10-05 22:51:28 +08:00
|
|
|
|
{daysDiff > 0 && (
|
✨ feat: Add topup billing history with admin manual completion
Implement comprehensive topup billing system with user history viewing and admin management capabilities.
## Features Added
### Frontend
- Add topup history modal with paginated billing records
- Display order details: trade number, payment method, amount, money, status, create time
- Implement empty state with proper illustrations
- Add payment method column with localized display (Stripe, Alipay, WeChat)
- Add admin manual completion feature for pending orders
- Add Coins icon for recharge amount display
- Integrate "Bills" button in RechargeCard header
- Optimize code quality by using shared utility functions (isAdmin)
- Extract constants for status and payment method mappings
- Use React.useMemo for performance optimization
### Backend
- Create GET `/api/user/topup/self` endpoint for user topup history with pagination
- Create POST `/api/user/topup/complete` endpoint for admin manual order completion
- Add `payment_method` field to TopUp model for tracking payment types
- Implement `GetUserTopUps` method with proper pagination and ordering
- Implement `ManualCompleteTopUp` with transaction safety and row-level locking
- Add application-level mutex locks to prevent concurrent order processing
- Record payment method in Epay and Stripe payment flows
- Ensure idempotency and data consistency with proper error handling
### Internationalization
- Add i18n keys for Chinese (zh), English (en), and French (fr)
- Support for billing-related UI text and status messages
## Technical Improvements
- Use database transactions with FOR UPDATE row-level locking
- Implement sync.Map-based mutex for order-level concurrency control
- Proper error handling and user-friendly toast notifications
- Follow existing codebase patterns for empty states and modals
- Maintain code quality with extracted render functions and constants
## Files Changed
- Backend: controller/topup.go, controller/topup_stripe.go, model/topup.go, router/api-router.go
- Frontend: web/src/components/topup/modals/TopupHistoryModal.jsx (new), web/src/components/topup/RechargeCard.jsx, web/src/components/topup/index.jsx
- i18n: web/src/i18n/locales/{zh,en,fr}.json
2025-10-07 00:22:45 +08:00
|
|
|
|
<Text type='tertiary'>
|
|
|
|
|
|
{' '}
|
|
|
|
|
|
({t('约')} {daysDiff} {t('天前')})
|
|
|
|
|
|
</Text>
|
2025-10-05 22:51:28 +08:00
|
|
|
|
)}
|
|
|
|
|
|
</p>
|
✨ feat: Add topup billing history with admin manual completion
Implement comprehensive topup billing system with user history viewing and admin management capabilities.
## Features Added
### Frontend
- Add topup history modal with paginated billing records
- Display order details: trade number, payment method, amount, money, status, create time
- Implement empty state with proper illustrations
- Add payment method column with localized display (Stripe, Alipay, WeChat)
- Add admin manual completion feature for pending orders
- Add Coins icon for recharge amount display
- Integrate "Bills" button in RechargeCard header
- Optimize code quality by using shared utility functions (isAdmin)
- Extract constants for status and payment method mappings
- Use React.useMemo for performance optimization
### Backend
- Create GET `/api/user/topup/self` endpoint for user topup history with pagination
- Create POST `/api/user/topup/complete` endpoint for admin manual order completion
- Add `payment_method` field to TopUp model for tracking payment types
- Implement `GetUserTopUps` method with proper pagination and ordering
- Implement `ManualCompleteTopUp` with transaction safety and row-level locking
- Add application-level mutex locks to prevent concurrent order processing
- Record payment method in Epay and Stripe payment flows
- Ensure idempotency and data consistency with proper error handling
### Internationalization
- Add i18n keys for Chinese (zh), English (en), and French (fr)
- Support for billing-related UI text and status messages
## Technical Improvements
- Use database transactions with FOR UPDATE row-level locking
- Implement sync.Map-based mutex for order-level concurrency control
- Proper error handling and user-friendly toast notifications
- Follow existing codebase patterns for empty states and modals
- Maintain code quality with extracted render functions and constants
## Files Changed
- Backend: controller/topup.go, controller/topup_stripe.go, model/topup.go, router/api-router.go
- Frontend: web/src/components/topup/modals/TopupHistoryModal.jsx (new), web/src/components/topup/RechargeCard.jsx, web/src/components/topup/index.jsx
- i18n: web/src/i18n/locales/{zh,en,fr}.json
2025-10-07 00:22:45 +08:00
|
|
|
|
<div
|
|
|
|
|
|
style={{
|
|
|
|
|
|
background: '#fff7e6',
|
|
|
|
|
|
border: '1px solid #ffd591',
|
|
|
|
|
|
padding: '12px',
|
|
|
|
|
|
borderRadius: '4px',
|
|
|
|
|
|
marginTop: '12px',
|
|
|
|
|
|
color: '#333',
|
|
|
|
|
|
}}
|
|
|
|
|
|
>
|
|
|
|
|
|
<Text strong style={{ color: '#d46b08' }}>
|
|
|
|
|
|
⚠️ {t('注意')}:
|
|
|
|
|
|
</Text>
|
2025-10-05 23:39:20 +08:00
|
|
|
|
<Text style={{ color: '#333' }}>{t('将删除')} </Text>
|
✨ feat: Add topup billing history with admin manual completion
Implement comprehensive topup billing system with user history viewing and admin management capabilities.
## Features Added
### Frontend
- Add topup history modal with paginated billing records
- Display order details: trade number, payment method, amount, money, status, create time
- Implement empty state with proper illustrations
- Add payment method column with localized display (Stripe, Alipay, WeChat)
- Add admin manual completion feature for pending orders
- Add Coins icon for recharge amount display
- Integrate "Bills" button in RechargeCard header
- Optimize code quality by using shared utility functions (isAdmin)
- Extract constants for status and payment method mappings
- Use React.useMemo for performance optimization
### Backend
- Create GET `/api/user/topup/self` endpoint for user topup history with pagination
- Create POST `/api/user/topup/complete` endpoint for admin manual order completion
- Add `payment_method` field to TopUp model for tracking payment types
- Implement `GetUserTopUps` method with proper pagination and ordering
- Implement `ManualCompleteTopUp` with transaction safety and row-level locking
- Add application-level mutex locks to prevent concurrent order processing
- Record payment method in Epay and Stripe payment flows
- Ensure idempotency and data consistency with proper error handling
### Internationalization
- Add i18n keys for Chinese (zh), English (en), and French (fr)
- Support for billing-related UI text and status messages
## Technical Improvements
- Use database transactions with FOR UPDATE row-level locking
- Implement sync.Map-based mutex for order-level concurrency control
- Proper error handling and user-friendly toast notifications
- Follow existing codebase patterns for empty states and modals
- Maintain code quality with extracted render functions and constants
## Files Changed
- Backend: controller/topup.go, controller/topup_stripe.go, model/topup.go, router/api-router.go
- Frontend: web/src/components/topup/modals/TopupHistoryModal.jsx (new), web/src/components/topup/RechargeCard.jsx, web/src/components/topup/index.jsx
- i18n: web/src/i18n/locales/{zh,en,fr}.json
2025-10-07 00:22:45 +08:00
|
|
|
|
<Text strong style={{ color: '#cf1322' }}>
|
|
|
|
|
|
{targetTime}
|
|
|
|
|
|
</Text>
|
2025-10-05 22:51:28 +08:00
|
|
|
|
{daysDiff > 0 && (
|
✨ feat: Add topup billing history with admin manual completion
Implement comprehensive topup billing system with user history viewing and admin management capabilities.
## Features Added
### Frontend
- Add topup history modal with paginated billing records
- Display order details: trade number, payment method, amount, money, status, create time
- Implement empty state with proper illustrations
- Add payment method column with localized display (Stripe, Alipay, WeChat)
- Add admin manual completion feature for pending orders
- Add Coins icon for recharge amount display
- Integrate "Bills" button in RechargeCard header
- Optimize code quality by using shared utility functions (isAdmin)
- Extract constants for status and payment method mappings
- Use React.useMemo for performance optimization
### Backend
- Create GET `/api/user/topup/self` endpoint for user topup history with pagination
- Create POST `/api/user/topup/complete` endpoint for admin manual order completion
- Add `payment_method` field to TopUp model for tracking payment types
- Implement `GetUserTopUps` method with proper pagination and ordering
- Implement `ManualCompleteTopUp` with transaction safety and row-level locking
- Add application-level mutex locks to prevent concurrent order processing
- Record payment method in Epay and Stripe payment flows
- Ensure idempotency and data consistency with proper error handling
### Internationalization
- Add i18n keys for Chinese (zh), English (en), and French (fr)
- Support for billing-related UI text and status messages
## Technical Improvements
- Use database transactions with FOR UPDATE row-level locking
- Implement sync.Map-based mutex for order-level concurrency control
- Proper error handling and user-friendly toast notifications
- Follow existing codebase patterns for empty states and modals
- Maintain code quality with extracted render functions and constants
## Files Changed
- Backend: controller/topup.go, controller/topup_stripe.go, model/topup.go, router/api-router.go
- Frontend: web/src/components/topup/modals/TopupHistoryModal.jsx (new), web/src/components/topup/RechargeCard.jsx, web/src/components/topup/index.jsx
- i18n: web/src/i18n/locales/{zh,en,fr}.json
2025-10-07 00:22:45 +08:00
|
|
|
|
<Text style={{ color: '#8c8c8c' }}>
|
|
|
|
|
|
{' '}
|
|
|
|
|
|
({t('约')} {daysDiff} {t('天前')})
|
|
|
|
|
|
</Text>
|
2025-10-05 22:51:28 +08:00
|
|
|
|
)}
|
2025-10-05 23:39:20 +08:00
|
|
|
|
<Text style={{ color: '#333' }}> {t('之前的所有日志')}</Text>
|
2025-10-05 22:51:28 +08:00
|
|
|
|
</div>
|
|
|
|
|
|
<p style={{ marginTop: '12px' }}>
|
✨ feat: Add topup billing history with admin manual completion
Implement comprehensive topup billing system with user history viewing and admin management capabilities.
## Features Added
### Frontend
- Add topup history modal with paginated billing records
- Display order details: trade number, payment method, amount, money, status, create time
- Implement empty state with proper illustrations
- Add payment method column with localized display (Stripe, Alipay, WeChat)
- Add admin manual completion feature for pending orders
- Add Coins icon for recharge amount display
- Integrate "Bills" button in RechargeCard header
- Optimize code quality by using shared utility functions (isAdmin)
- Extract constants for status and payment method mappings
- Use React.useMemo for performance optimization
### Backend
- Create GET `/api/user/topup/self` endpoint for user topup history with pagination
- Create POST `/api/user/topup/complete` endpoint for admin manual order completion
- Add `payment_method` field to TopUp model for tracking payment types
- Implement `GetUserTopUps` method with proper pagination and ordering
- Implement `ManualCompleteTopUp` with transaction safety and row-level locking
- Add application-level mutex locks to prevent concurrent order processing
- Record payment method in Epay and Stripe payment flows
- Ensure idempotency and data consistency with proper error handling
### Internationalization
- Add i18n keys for Chinese (zh), English (en), and French (fr)
- Support for billing-related UI text and status messages
## Technical Improvements
- Use database transactions with FOR UPDATE row-level locking
- Implement sync.Map-based mutex for order-level concurrency control
- Proper error handling and user-friendly toast notifications
- Follow existing codebase patterns for empty states and modals
- Maintain code quality with extracted render functions and constants
## Files Changed
- Backend: controller/topup.go, controller/topup_stripe.go, model/topup.go, router/api-router.go
- Frontend: web/src/components/topup/modals/TopupHistoryModal.jsx (new), web/src/components/topup/RechargeCard.jsx, web/src/components/topup/index.jsx
- i18n: web/src/i18n/locales/{zh,en,fr}.json
2025-10-07 00:22:45 +08:00
|
|
|
|
<Text type='danger'>
|
|
|
|
|
|
{t('此操作不可恢复,请仔细确认时间后再操作!')}
|
|
|
|
|
|
</Text>
|
2025-10-05 22:51:28 +08:00
|
|
|
|
</p>
|
|
|
|
|
|
</div>
|
|
|
|
|
|
),
|
|
|
|
|
|
okText: t('确认删除'),
|
|
|
|
|
|
cancelText: t('取消'),
|
|
|
|
|
|
okType: 'danger',
|
|
|
|
|
|
onOk: async () => {
|
|
|
|
|
|
try {
|
|
|
|
|
|
setLoadingCleanHistoryLog(true);
|
|
|
|
|
|
const res = await API.delete(
|
|
|
|
|
|
`/api/log/?target_timestamp=${Date.parse(inputs.historyTimestamp) / 1000}`,
|
|
|
|
|
|
);
|
|
|
|
|
|
const { success, message, data } = res.data;
|
|
|
|
|
|
if (success) {
|
|
|
|
|
|
showSuccess(`${data} ${t('条日志已清理!')}`);
|
|
|
|
|
|
return;
|
|
|
|
|
|
} else {
|
|
|
|
|
|
throw new Error(t('日志清理失败:') + message);
|
|
|
|
|
|
}
|
|
|
|
|
|
} catch (error) {
|
|
|
|
|
|
showError(error.message);
|
|
|
|
|
|
} finally {
|
|
|
|
|
|
setLoadingCleanHistoryLog(false);
|
|
|
|
|
|
}
|
|
|
|
|
|
},
|
|
|
|
|
|
});
|
2024-05-11 14:06:32 +08:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
useEffect(() => {
|
|
|
|
|
|
const currentInputs = {};
|
|
|
|
|
|
for (let key in props.options) {
|
|
|
|
|
|
if (Object.keys(inputs).includes(key)) {
|
|
|
|
|
|
currentInputs[key] = props.options[key];
|
|
|
|
|
|
}
|
|
|
|
|
|
}
|
|
|
|
|
|
currentInputs['historyTimestamp'] = inputs.historyTimestamp;
|
|
|
|
|
|
setInputs(Object.assign(inputs, currentInputs));
|
|
|
|
|
|
setInputsRow(structuredClone(currentInputs));
|
|
|
|
|
|
refForm.current.setValues(currentInputs);
|
|
|
|
|
|
}, [props.options]);
|
|
|
|
|
|
return (
|
|
|
|
|
|
<>
|
|
|
|
|
|
<Spin spinning={loading}>
|
|
|
|
|
|
<Form
|
|
|
|
|
|
values={inputs}
|
|
|
|
|
|
getFormApi={(formAPI) => (refForm.current = formAPI)}
|
|
|
|
|
|
style={{ marginBottom: 15 }}
|
|
|
|
|
|
>
|
2024-12-13 19:03:14 +08:00
|
|
|
|
<Form.Section text={t('日志设置')}>
|
2024-05-11 14:06:32 +08:00
|
|
|
|
<Row gutter={16}>
|
2025-03-10 21:05:22 +08:00
|
|
|
|
<Col xs={24} sm={12} md={8} lg={8} xl={8}>
|
2024-05-11 14:06:32 +08:00
|
|
|
|
<Form.Switch
|
|
|
|
|
|
field={'LogConsumeEnabled'}
|
2024-12-13 19:03:14 +08:00
|
|
|
|
label={t('启用额度消费日志记录')}
|
2024-11-12 16:32:40 +08:00
|
|
|
|
size='default'
|
2024-05-11 14:06:32 +08:00
|
|
|
|
checkedText='|'
|
|
|
|
|
|
uncheckedText='〇'
|
|
|
|
|
|
onChange={(value) => {
|
|
|
|
|
|
setInputs({
|
|
|
|
|
|
...inputs,
|
|
|
|
|
|
LogConsumeEnabled: value,
|
|
|
|
|
|
});
|
|
|
|
|
|
}}
|
|
|
|
|
|
/>
|
|
|
|
|
|
</Col>
|
2025-03-10 21:05:22 +08:00
|
|
|
|
<Col xs={24} sm={12} md={8} lg={8} xl={8}>
|
2024-05-11 14:06:32 +08:00
|
|
|
|
<Spin spinning={loadingCleanHistoryLog}>
|
|
|
|
|
|
<Form.DatePicker
|
2025-10-05 22:51:28 +08:00
|
|
|
|
label={t('清除历史日志')}
|
2024-05-11 14:06:32 +08:00
|
|
|
|
field={'historyTimestamp'}
|
|
|
|
|
|
type='dateTime'
|
|
|
|
|
|
inputReadOnly={true}
|
|
|
|
|
|
onChange={(value) => {
|
|
|
|
|
|
setInputs({
|
|
|
|
|
|
...inputs,
|
|
|
|
|
|
historyTimestamp: value,
|
|
|
|
|
|
});
|
|
|
|
|
|
}}
|
|
|
|
|
|
/>
|
✨ feat: Add topup billing history with admin manual completion
Implement comprehensive topup billing system with user history viewing and admin management capabilities.
## Features Added
### Frontend
- Add topup history modal with paginated billing records
- Display order details: trade number, payment method, amount, money, status, create time
- Implement empty state with proper illustrations
- Add payment method column with localized display (Stripe, Alipay, WeChat)
- Add admin manual completion feature for pending orders
- Add Coins icon for recharge amount display
- Integrate "Bills" button in RechargeCard header
- Optimize code quality by using shared utility functions (isAdmin)
- Extract constants for status and payment method mappings
- Use React.useMemo for performance optimization
### Backend
- Create GET `/api/user/topup/self` endpoint for user topup history with pagination
- Create POST `/api/user/topup/complete` endpoint for admin manual order completion
- Add `payment_method` field to TopUp model for tracking payment types
- Implement `GetUserTopUps` method with proper pagination and ordering
- Implement `ManualCompleteTopUp` with transaction safety and row-level locking
- Add application-level mutex locks to prevent concurrent order processing
- Record payment method in Epay and Stripe payment flows
- Ensure idempotency and data consistency with proper error handling
### Internationalization
- Add i18n keys for Chinese (zh), English (en), and French (fr)
- Support for billing-related UI text and status messages
## Technical Improvements
- Use database transactions with FOR UPDATE row-level locking
- Implement sync.Map-based mutex for order-level concurrency control
- Proper error handling and user-friendly toast notifications
- Follow existing codebase patterns for empty states and modals
- Maintain code quality with extracted render functions and constants
## Files Changed
- Backend: controller/topup.go, controller/topup_stripe.go, model/topup.go, router/api-router.go
- Frontend: web/src/components/topup/modals/TopupHistoryModal.jsx (new), web/src/components/topup/RechargeCard.jsx, web/src/components/topup/index.jsx
- i18n: web/src/i18n/locales/{zh,en,fr}.json
2025-10-07 00:22:45 +08:00
|
|
|
|
<Text
|
|
|
|
|
|
type='tertiary'
|
|
|
|
|
|
size='small'
|
|
|
|
|
|
style={{ display: 'block', marginTop: 4, marginBottom: 8 }}
|
|
|
|
|
|
>
|
2025-10-05 22:51:28 +08:00
|
|
|
|
{t('将清除选定时间之前的所有日志')}
|
|
|
|
|
|
</Text>
|
✨ feat: Add topup billing history with admin manual completion
Implement comprehensive topup billing system with user history viewing and admin management capabilities.
## Features Added
### Frontend
- Add topup history modal with paginated billing records
- Display order details: trade number, payment method, amount, money, status, create time
- Implement empty state with proper illustrations
- Add payment method column with localized display (Stripe, Alipay, WeChat)
- Add admin manual completion feature for pending orders
- Add Coins icon for recharge amount display
- Integrate "Bills" button in RechargeCard header
- Optimize code quality by using shared utility functions (isAdmin)
- Extract constants for status and payment method mappings
- Use React.useMemo for performance optimization
### Backend
- Create GET `/api/user/topup/self` endpoint for user topup history with pagination
- Create POST `/api/user/topup/complete` endpoint for admin manual order completion
- Add `payment_method` field to TopUp model for tracking payment types
- Implement `GetUserTopUps` method with proper pagination and ordering
- Implement `ManualCompleteTopUp` with transaction safety and row-level locking
- Add application-level mutex locks to prevent concurrent order processing
- Record payment method in Epay and Stripe payment flows
- Ensure idempotency and data consistency with proper error handling
### Internationalization
- Add i18n keys for Chinese (zh), English (en), and French (fr)
- Support for billing-related UI text and status messages
## Technical Improvements
- Use database transactions with FOR UPDATE row-level locking
- Implement sync.Map-based mutex for order-level concurrency control
- Proper error handling and user-friendly toast notifications
- Follow existing codebase patterns for empty states and modals
- Maintain code quality with extracted render functions and constants
## Files Changed
- Backend: controller/topup.go, controller/topup_stripe.go, model/topup.go, router/api-router.go
- Frontend: web/src/components/topup/modals/TopupHistoryModal.jsx (new), web/src/components/topup/RechargeCard.jsx, web/src/components/topup/index.jsx
- i18n: web/src/i18n/locales/{zh,en,fr}.json
2025-10-07 00:22:45 +08:00
|
|
|
|
<Button
|
|
|
|
|
|
size='default'
|
|
|
|
|
|
type='danger'
|
|
|
|
|
|
onClick={onCleanHistoryLog}
|
|
|
|
|
|
>
|
2024-12-13 19:03:14 +08:00
|
|
|
|
{t('清除历史日志')}
|
2024-05-11 14:06:32 +08:00
|
|
|
|
</Button>
|
|
|
|
|
|
</Spin>
|
|
|
|
|
|
</Col>
|
|
|
|
|
|
</Row>
|
|
|
|
|
|
|
|
|
|
|
|
<Row>
|
2024-11-12 16:30:51 +08:00
|
|
|
|
<Button size='default' onClick={onSubmit}>
|
2024-12-13 19:03:14 +08:00
|
|
|
|
{t('保存日志设置')}
|
2024-05-11 14:06:32 +08:00
|
|
|
|
</Button>
|
|
|
|
|
|
</Row>
|
|
|
|
|
|
</Form.Section>
|
|
|
|
|
|
</Form>
|
|
|
|
|
|
</Spin>
|
|
|
|
|
|
</>
|
|
|
|
|
|
);
|
|
|
|
|
|
}
|