diff --git a/backend/internal/service/payment_order.go b/backend/internal/service/payment_order.go index 1d5562dd..a38173fd 100644 --- a/backend/internal/service/payment_order.go +++ b/backend/internal/service/payment_order.go @@ -51,7 +51,7 @@ func (s *PaymentService) CreateOrder(ctx context.Context, req CreateOrderRequest } else if req.OrderType == payment.OrderTypeBalance { orderAmount = calculateCreditedBalance(req.Amount, cfg.BalanceRechargeMultiplier) } - feeRate := s.getFeeRate(req.PaymentType) + feeRate := cfg.RechargeFeeRate payAmountStr := payment.CalculatePayAmount(limitAmount, feeRate) payAmount, _ := strconv.ParseFloat(payAmountStr, 64) order, err := s.createOrderInTx(ctx, req, user, plan, cfg, orderAmount, limitAmount, feeRate, payAmount) diff --git a/backend/internal/service/payment_service.go b/backend/internal/service/payment_service.go index 6d8b185e..f88e4171 100644 --- a/backend/internal/service/payment_service.go +++ b/backend/internal/service/payment_service.go @@ -288,7 +288,6 @@ func psComputeValidityDays(days int, unit string) int { } } -func (s *PaymentService) getFeeRate(_ string) float64 { return 0 } func psStartOfDayUTC(t time.Time) time.Time { y, m, d := t.UTC().Date() diff --git a/frontend/src/components/admin/payment/AdminOrderDetail.vue b/frontend/src/components/admin/payment/AdminOrderDetail.vue index 5a07c097..9ab1ba95 100644 --- a/frontend/src/components/admin/payment/AdminOrderDetail.vue +++ b/frontend/src/components/admin/payment/AdminOrderDetail.vue @@ -18,23 +18,27 @@
-

{{ t('payment.orders.amount') }}

-

{{ order.order_type === 'balance' ? '$' : '¥' }}{{ order.amount.toFixed(2) }}

+

{{ t('payment.orders.baseAmount') }}

+

¥{{ baseAmount.toFixed(2) }}

+
+
+

{{ t('payment.orders.fee') }} ({{ order.fee_rate }}%)

+

¥{{ feeAmount.toFixed(2) }}

{{ t('payment.orders.payAmount') }}

¥{{ order.pay_amount.toFixed(2) }}

+
+

{{ t('payment.orders.creditedAmount') }}

+

{{ order.order_type === 'balance' ? '$' : '¥' }}{{ order.amount.toFixed(2) }}

+

{{ t('payment.orders.paymentMethod') }}

{{ t('payment.methods.' + order.payment_type, order.payment_type) }}

-
-

{{ t('payment.admin.feeRate') }}

-

{{ (order.fee_rate * 100).toFixed(1) }}%

-

{{ t('payment.admin.orderType') }}

@@ -110,6 +114,7 @@