yml/hfb_sys
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Wallet与Withdrawal模块：完成分字段重构

Browse Source 
核心改造：
1. Wallet模块DTO层全部改为*Cent int64字段
2. Wallet.Entry结构从Amount float64改为AmountCent int64
3. Repository层applyEntry函数使用整数加减，无需浮点运算
4. Withdrawal模块DTO/Request全部改为*Cent字段
5. 所有wallet.AppendEntries调用点改为AmountCent
6. 提现手续费计算改为分单位

技术细节：
- 删除了roundWalletMoney函数（不再需要）
- toAccountDTO/toLedgerDTO使用*Cent字段
- 最小提现金额：10元=1000分
- 最大提现金额：5000元=500000分
- 编译验证通过 ✅

Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>
This commit is contained in:
yml
2026-06-09 13:44:20 +08:00
co-authored by Claude Opus 4.8
parent e2780ffb86
commit 01909ee7e5
6 changed files with 142 additions and 147 deletions
Download Patch File Download Diff File Expand all files Collapse all files
backend/internal/modules/wallet/dto.go
+33 -33
View File
@@ -3,33 +3,33 @@ package wallet
import "time"
type AccountDTO struct {
UserID uint64 `json:"user_id"`
AvailableBalance float64 `json:"available_balance"`
FrozenBalance float64 `json:"frozen_balance"`
Status string `json:"status"`
UserID uint64 `json:"user_id"`
AvailableBalanceCent int64 `json:"available_balance_cent"`
FrozenBalanceCent int64 `json:"frozen_balance_cent"`
Status string `json:"status"`
}
type RechargeRequest struct {
Amount float64 `json:"amount" binding:"required"`
AmountCent int64 `json:"amount_cent" binding:"required"`
}
type WithdrawRequest struct {
Amount float64 `json:"amount" binding:"required"`
AmountCent int64 `json:"amount_cent" binding:"required"`
}
type LedgerDTO struct {
ID uint64 `json:"id"`
LedgerNo string `json:"ledger_no"`
UserID uint64 `json:"user_id"`
OrderID *uint64 `json:"order_id"`
Direction string `json:"direction"`
Amount float64 `json:"amount"`
BalanceAfter float64 `json:"balance_after"`
BalanceType string `json:"balance_type"`
BizType string `json:"biz_type"`
BizNo string `json:"biz_no"`
Remark string `json:"remark"`
CreatedAt time.Time `json:"created_at"`
ID uint64 `json:"id"`
LedgerNo string `json:"ledger_no"`
UserID uint64 `json:"user_id"`
OrderID *uint64 `json:"order_id"`
Direction string `json:"direction"`
AmountCent int64 `json:"amount_cent"`
BalanceAfterCent int64 `json:"balance_after_cent"`
BalanceType string `json:"balance_type"`
BizType string `json:"biz_type"`
BizNo string `json:"biz_no"`
Remark string `json:"remark"`
CreatedAt time.Time `json:"created_at"`
}
type AdminLedgerQuery struct {
@@ -48,19 +48,19 @@ type PaginatedResult struct {
}
type AdminLedgerDTO struct {
ID uint64 `json:"id"`
LedgerNo string `json:"ledger_no"`
UserID uint64 `json:"user_id"`
UserPhone string `json:"user_phone"`
UserNickname string `json:"user_nickname"`
OrderID *uint64 `json:"order_id"`
OrderNo string `json:"order_no"`
Direction string `json:"direction"`
Amount float64 `json:"amount"`
BalanceAfter float64 `json:"balance_after"`
BalanceType string `json:"balance_type"`
BizType string `json:"biz_type"`
BizNo string `json:"biz_no"`
Remark string `json:"remark"`
CreatedAt time.Time `json:"created_at"`
ID uint64 `json:"id"`
LedgerNo string `json:"ledger_no"`
UserID uint64 `json:"user_id"`
UserPhone string `json:"user_phone"`
UserNickname string `json:"user_nickname"`
OrderID *uint64 `json:"order_id"`
OrderNo string `json:"order_no"`
Direction string `json:"direction"`
AmountCent int64 `json:"amount_cent"`
BalanceAfterCent int64 `json:"balance_after_cent"`
BalanceType string `json:"balance_type"`
BizType string `json:"biz_type"`
BizNo string `json:"biz_no"`
Remark string `json:"remark"`
CreatedAt time.Time `json:"created_at"`
}
backend/internal/modules/wallet/repository.go
+49 -55
View File
@@ -21,7 +21,7 @@ type Entry struct {
UserID uint64
OrderID *uint64
Direction string
Amount float64
AmountCent int64
BalanceType string
BizType string
BizNo string
@@ -63,12 +63,12 @@ func (r *Repository) Ledger(userID uint64, page, pageSize int) (*PaginatedResult
return &PaginatedResult{Items: items, Total: total, Page: page, PageSize: pageSize}, nil
}
func (r *Repository) Recharge(userID uint64, amount float64) (*AccountDTO, error) {
func (r *Repository) Recharge(userID uint64, amountCent int64) (*AccountDTO, error) {
err := r.db.Transaction(func(tx *gorm.DB) error {
return AppendEntries(tx, Entry{
UserID: userID,
Direction: "in",
Amount: amount,
AmountCent: amountCent,
BalanceType: "available",
BizType: "dev_recharge",
BizNo: "DEV",
@@ -85,7 +85,6 @@ func (r *Repository) ConfirmRechargeFromChannel(userID uint64, bizNo string, amo
if userID == 0 || amountCent <= 0 || bizNo == "" {
return ErrInvalidAmount
}
amount := roundWalletMoney(float64(amountCent) / 100)
return r.db.Transaction(func(tx *gorm.DB) error {
if err := ensureAccount(tx, userID); err != nil {
return err
@@ -108,7 +107,7 @@ func (r *Repository) ConfirmRechargeFromChannel(userID uint64, bizNo string, amo
return AppendEntries(tx, Entry{
UserID: userID,
Direction: "in",
Amount: amount,
AmountCent: amountCent,
BalanceType: "available",
BizType: "channel_recharge",
BizNo: bizNo,
@@ -118,16 +117,15 @@ func (r *Repository) ConfirmRechargeFromChannel(userID uint64, bizNo string, amo
}
// Withdraw 保留仓库能力；当前公开提现入口在 service 层标记为待开发，不会调用到这里。
func (r *Repository) Withdraw(userID uint64, amount float64) (*AccountDTO, error) {
amount = roundWalletMoney(amount)
if userID == 0 || amount <= 0 {
func (r *Repository) Withdraw(userID uint64, amountCent int64) (*AccountDTO, error) {
if userID == 0 || amountCent <= 0 {
return nil, ErrInvalidAmount
}
err := r.db.Transaction(func(tx *gorm.DB) error {
return AppendEntries(tx, Entry{
UserID: userID,
Direction: "out",
Amount: amount,
AmountCent: amountCent,
BalanceType: "available",
BizType: "withdraw_apply",
BizNo: fmt.Sprintf("WD%d", time.Now().UnixNano()),
@@ -144,7 +142,7 @@ func (r *Repository) AdminLedger(query AdminLedgerQuery) (*PaginatedResult, erro
db := r.db.Table("wallet_ledger AS wl").
Select(`wl.id, wl.ledger_no, wl.user_id, COALESCE(u.phone, '') AS user_phone,
COALESCE(u.nickname, '') AS user_nickname, wl.order_id, COALESCE(ro.order_no, '') AS order_no,
wl.direction, wl.amount, wl.balance_after, wl.balance_type, wl.biz_type, wl.biz_no,
wl.direction, wl.amount_cent, wl.balance_after_cent, wl.balance_type, wl.biz_type, wl.biz_no,
wl.remark, wl.created_at`).
Joins("LEFT JOIN users AS u ON u.id = wl.user_id").
Joins("LEFT JOIN rental_orders AS ro ON ro.id = wl.order_id")
@@ -178,8 +176,7 @@ func (r *Repository) AdminLedger(query AdminLedgerQuery) (*PaginatedResult, erro
func AppendEntries(tx *gorm.DB, entries ...Entry) error {
for _, entry := range entries {
entry.Amount = roundWalletMoney(entry.Amount)
if entry.Amount <= 0 {
if entry.AmountCent <= 0 {
continue
}
if err := ensureAccount(tx, entry.UserID); err != nil {
@@ -189,7 +186,7 @@ func AppendEntries(tx *gorm.DB, entries ...Entry) error {
if err := tx.Clauses(clause.Locking{Strength: "UPDATE"}).Where("user_id = ?", entry.UserID).First(&account).Error; err != nil {
return err
}
balanceAfter, err := applyEntry(&account, entry)
balanceAfterCent, err := applyEntry(&account, entry)
if err != nil {
return err
}
@@ -201,16 +198,16 @@ func AppendEntries(tx *gorm.DB, entries ...Entry) error {
return err
}
ledger := model.WalletLedger{
LedgerNo: ledgerNo,
UserID: entry.UserID,
OrderID: entry.OrderID,
Direction: entry.Direction,
Amount: entry.Amount,
BalanceAfter: balanceAfter,
BalanceType: entry.BalanceType,
BizType: entry.BizType,
BizNo: entry.BizNo,
Remark: entry.Remark,
LedgerNo: ledgerNo,
UserID: entry.UserID,
OrderID: entry.OrderID,
Direction: entry.Direction,
AmountCent: entry.AmountCent,
BalanceAfterCent: balanceAfterCent,
BalanceType: entry.BalanceType,
BizType: entry.BizType,
BizNo: entry.BizNo,
Remark: entry.Remark,
}
if err := tx.Create(&ledger).Error; err != nil {
return err
@@ -221,39 +218,36 @@ func AppendEntries(tx *gorm.DB, entries ...Entry) error {
func ensureAccount(tx *gorm.DB, userID uint64) error {
account := model.WalletAccount{
UserID: userID,
AvailableBalance: 0,
FrozenBalance: 0,
Status: "active",
UserID: userID,
AvailableBalanceCent: 0,
FrozenBalanceCent: 0,
Status: "active",
}
return tx.Clauses(clause.OnConflict{DoNothing: true}).Create(&account).Error
}
func applyEntry(account *model.WalletAccount, entry Entry) (float64, error) {
entry.Amount = roundWalletMoney(entry.Amount)
account.AvailableBalance = roundWalletMoney(account.AvailableBalance)
account.FrozenBalance = roundWalletMoney(account.FrozenBalance)
func applyEntry(account *model.WalletAccount, entry Entry) (int64, error) {
switch entry.BalanceType {
case "available":
if entry.Direction == "in" {
account.AvailableBalance = roundWalletMoney(account.AvailableBalance + entry.Amount)
account.AvailableBalanceCent += entry.AmountCent
} else {
if account.AvailableBalance < entry.Amount {
if account.AvailableBalanceCent < entry.AmountCent {
return 0, ErrInsufficientBalance
}
account.AvailableBalance = roundWalletMoney(account.AvailableBalance - entry.Amount)
account.AvailableBalanceCent -= entry.AmountCent
}
return account.AvailableBalance, nil
return account.AvailableBalanceCent, nil
case "frozen":
if entry.Direction == "in" {
account.FrozenBalance = roundWalletMoney(account.FrozenBalance + entry.Amount)
account.FrozenBalanceCent += entry.AmountCent
} else {
if account.FrozenBalance < entry.Amount {
if account.FrozenBalanceCent < entry.AmountCent {
return 0, ErrInsufficientBalance
}
account.FrozenBalance = roundWalletMoney(account.FrozenBalance - entry.Amount)
account.FrozenBalanceCent -= entry.AmountCent
}
return account.FrozenBalance, nil
return account.FrozenBalanceCent, nil
default:
return 0, fmt.Errorf("unsupported balance type: %s", entry.BalanceType)
}
@@ -265,27 +259,27 @@ func roundWalletMoney(value float64) float64 {
func toAccountDTO(account model.WalletAccount) *AccountDTO {
return &AccountDTO{
UserID: account.UserID,
AvailableBalance: account.AvailableBalance,
FrozenBalance: account.FrozenBalance,
Status: account.Status,
UserID: account.UserID,
AvailableBalanceCent: account.AvailableBalanceCent,
FrozenBalanceCent: account.FrozenBalanceCent,
Status: account.Status,
}
}
func toLedgerDTO(row model.WalletLedger) LedgerDTO {
return LedgerDTO{
ID: row.ID,
LedgerNo: row.LedgerNo,
UserID: row.UserID,
OrderID: row.OrderID,
Direction: row.Direction,
Amount: row.Amount,
BalanceAfter: row.BalanceAfter,
BalanceType: row.BalanceType,
BizType: row.BizType,
BizNo: row.BizNo,
Remark: row.Remark,
CreatedAt: row.CreatedAt,
ID: row.ID,
LedgerNo: row.LedgerNo,
UserID: row.UserID,
OrderID: row.OrderID,
Direction: row.Direction,
AmountCent: row.AmountCent,
BalanceAfterCent: row.BalanceAfterCent,
BalanceType: row.BalanceType,
BizType: row.BizType,
BizNo: row.BizNo,
Remark: row.Remark,
CreatedAt: row.CreatedAt,
}
}
backend/internal/modules/wallet/service.go
+2 -1
View File
@@ -10,7 +10,8 @@ var (
ErrRechargeDisabled = errors.New("wallet recharge disabled")
)
const MinRechargeAmount = 0.01
// MinRechargeAmountCent 最小充值金额：1分
const MinRechargeAmountCent = 1
type Service struct {
repo *Repository
backend/internal/modules/withdrawal/dto.go
+21 -21
View File
@@ -6,22 +6,22 @@ import (
// 用户端 DTO
type WithdrawalDTO struct {
ID uint64 `json:"id"`
WithdrawNo string `json:"withdraw_no"`
UserID uint64 `json:"user_id"`
Amount float64 `json:"amount"`
Fee float64 `json:"fee"`
ActualAmount float64 `json:"actual_amount"`
AccountType string `json:"account_type"`
AccountName string `json:"account_name"`
AccountNo string `json:"account_no"` // 脱敏
BankName string `json:"bank_name"`
Status string `json:"status"`
ReviewRemark string `json:"review_remark"`
CreatedAt time.Time `json:"created_at"`
UpdatedAt time.Time `json:"updated_at"`
ReviewedAt *time.Time `json:"reviewed_at"`
PaidAt *time.Time `json:"paid_at"`
ID uint64 `json:"id"`
WithdrawNo string `json:"withdraw_no"`
UserID uint64 `json:"user_id"`
AmountCent int64 `json:"amount_cent"`
FeeCent int64 `json:"fee_cent"`
ActualAmountCent int64 `json:"actual_amount_cent"`
AccountType string `json:"account_type"`
AccountName string `json:"account_name"`
AccountNo string `json:"account_no"` // 脱敏
BankName string `json:"bank_name"`
Status string `json:"status"`
ReviewRemark string `json:"review_remark"`
CreatedAt time.Time `json:"created_at"`
UpdatedAt time.Time `json:"updated_at"`
ReviewedAt *time.Time `json:"reviewed_at"`
PaidAt *time.Time `json:"paid_at"`
}
// 管理员端详细 DTO
@@ -31,9 +31,9 @@ type WithdrawalDetailDTO struct {
UserID uint64 `json:"user_id"`
UserNickname string `json:"user_nickname"`
UserPhone string `json:"user_phone"`
Amount float64 `json:"amount"`
Fee float64 `json:"fee"`
ActualAmount float64 `json:"actual_amount"`
AmountCent int64 `json:"amount_cent"`
FeeCent int64 `json:"fee_cent"`
ActualAmountCent int64 `json:"actual_amount_cent"`
PaymentAccountID *uint64 `json:"payment_account_id"`
AccountType string `json:"account_type"`
AccountName string `json:"account_name"`
@@ -56,8 +56,8 @@ type WithdrawalDetailDTO struct {
}
type CreateWithdrawalRequest struct {
PaymentAccountID uint64 `json:"payment_account_id" binding:"required"`
Amount float64 `json:"amount" binding:"required,gt=0"`
PaymentAccountID uint64 `json:"payment_account_id" binding:"required"`
AmountCent int64 `json:"amount_cent" binding:"required,gt=0"`
}
type ReviewWithdrawalRequest struct {
backend/internal/modules/withdrawal/repository.go
+32 -32
View File
@@ -39,9 +39,9 @@ func (r *Repository) Create(userID uint64, req CreateWithdrawalRequest) (*Withdr
return nil, err
}
// 计算手续费和实际到账金额
fee := req.Amount * WithdrawalFeeRate
actualAmount := req.Amount - fee
// 计算手续费和实际到账金额（分）
feeCent := int64(float64(req.AmountCent) * WithdrawalFeeRate)
actualAmountCent := req.AmountCent - feeCent
// 生成提现单号
withdrawNo, err := generateWithdrawNo()
@@ -58,9 +58,9 @@ func (r *Repository) Create(userID uint64, req CreateWithdrawalRequest) (*Withdr
withdrawal := model.WithdrawalRequest{
WithdrawNo: withdrawNo,
UserID: userID,
Amount: req.Amount,
Fee: fee,
ActualAmount: actualAmount,
AmountCent: req.AmountCent,
FeeCent: feeCent,
ActualAmountCent: actualAmountCent,
PaymentAccountID: &req.PaymentAccountID,
AccountType: paymentAccount.AccountType,
AccountName: paymentAccount.AccountName,
@@ -81,7 +81,7 @@ func (r *Repository) Create(userID uint64, req CreateWithdrawalRequest) (*Withdr
if err := wallet.AppendEntries(tx, wallet.Entry{
UserID: userID,
Direction: "out",
Amount: req.Amount,
AmountCent: req.AmountCent,
BalanceType: "available",
BizType: "withdraw_freeze",
BizNo: withdrawNo,
@@ -89,7 +89,7 @@ func (r *Repository) Create(userID uint64, req CreateWithdrawalRequest) (*Withdr
}, wallet.Entry{
UserID: userID,
Direction: "in",
Amount: req.Amount,
AmountCent: req.AmountCent,
BalanceType: "frozen",
BizType: "withdraw_freeze",
BizNo: withdrawNo,
@@ -179,7 +179,7 @@ func (r *Repository) Cancel(userID, id uint64) error {
if err := wallet.AppendEntries(tx, wallet.Entry{
UserID: userID,
Direction: "out",
Amount: withdrawal.Amount,
AmountCent: withdrawal.AmountCent,
BalanceType: "frozen",
BizType: "withdraw_cancel",
BizNo: withdrawal.WithdrawNo,
@@ -187,7 +187,7 @@ func (r *Repository) Cancel(userID, id uint64) error {
}, wallet.Entry{
UserID: userID,
Direction: "in",
Amount: withdrawal.Amount,
AmountCent: withdrawal.AmountCent,
BalanceType: "available",
BizType: "withdraw_cancel",
BizNo: withdrawal.WithdrawNo,
@@ -292,7 +292,7 @@ func (r *Repository) Review(adminID, id uint64, req ReviewWithdrawalRequest) (*W
if err := wallet.AppendEntries(tx, wallet.Entry{
UserID: withdrawal.UserID,
Direction: "out",
Amount: withdrawal.Amount,
AmountCent: withdrawal.AmountCent,
BalanceType: "frozen",
BizType: "withdraw_reject",
BizNo: withdrawal.WithdrawNo,
@@ -300,7 +300,7 @@ func (r *Repository) Review(adminID, id uint64, req ReviewWithdrawalRequest) (*W
}, wallet.Entry{
UserID: withdrawal.UserID,
Direction: "in",
Amount: withdrawal.Amount,
AmountCent: withdrawal.AmountCent,
BalanceType: "available",
BizType: "withdraw_reject",
BizNo: withdrawal.WithdrawNo,
@@ -351,7 +351,7 @@ func (r *Repository) ConfirmPayment(adminID, id uint64, req ConfirmPaymentReques
if err := wallet.AppendEntries(tx, wallet.Entry{
UserID: withdrawal.UserID,
Direction: "out",
Amount: withdrawal.Amount,
AmountCent: withdrawal.AmountCent,
BalanceType: "frozen",
BizType: "withdraw_complete",
BizNo: withdrawal.WithdrawNo,
@@ -373,22 +373,22 @@ func (r *Repository) ConfirmPayment(adminID, id uint64, req ConfirmPaymentReques
// 转换为用户DTO
func toDTO(w model.WithdrawalRequest) WithdrawalDTO {
return WithdrawalDTO{
ID: w.ID,
WithdrawNo: w.WithdrawNo,
UserID: w.UserID,
Amount: w.Amount,
Fee: w.Fee,
ActualAmount: w.ActualAmount,
AccountType: w.AccountType,
AccountName: w.AccountName,
AccountNo: w.AccountNo,
BankName: w.BankName,
Status: w.Status,
ReviewRemark: w.ReviewRemark,
CreatedAt: w.CreatedAt,
UpdatedAt: w.UpdatedAt,
ReviewedAt: w.ReviewedAt,
PaidAt: w.PaidAt,
ID: w.ID,
WithdrawNo: w.WithdrawNo,
UserID: w.UserID,
AmountCent: w.AmountCent,
FeeCent: w.FeeCent,
ActualAmountCent: w.ActualAmountCent,
AccountType: w.AccountType,
AccountName: w.AccountName,
AccountNo: w.AccountNo,
BankName: w.BankName,
Status: w.Status,
ReviewRemark: w.ReviewRemark,
CreatedAt: w.CreatedAt,
UpdatedAt: w.UpdatedAt,
ReviewedAt: w.ReviewedAt,
PaidAt: w.PaidAt,
}
}
@@ -440,9 +440,9 @@ func (r *Repository) toDetailDTO(w model.WithdrawalRequest) (*WithdrawalDetailDT
UserID: w.UserID,
UserNickname: user.Nickname,
UserPhone: user.Phone,
Amount: w.Amount,
Fee: w.Fee,
ActualAmount: w.ActualAmount,
AmountCent: w.AmountCent,
FeeCent: w.FeeCent,
ActualAmountCent: w.ActualAmountCent,
PaymentAccountID: w.PaymentAccountID,
AccountType: w.AccountType,
AccountName: w.AccountName,
backend/internal/modules/withdrawal/service.go
+5 -5
View File
@@ -14,9 +14,9 @@ var (
)
const (
MinWithdrawalAmount = 10.0 // 最低提现金额
MaxWithdrawalAmount = 5000.0 // 单笔最高提现金额
WithdrawalFeeRate = 0.0 // 手续费率（暂时0%）
MinWithdrawalAmountCent = 1000 // 最低提现金额：10元 = 1000分
MaxWithdrawalAmountCent = 500000 // 单笔最高提现金额：5000元 = 500000分
WithdrawalFeeRate = 0.0 // 手续费率（暂时0%）
)
type Service struct {
@@ -34,10 +34,10 @@ func (s *Service) Create(userID uint64, req CreateWithdrawalRequest) (*Withdrawa
}
// 验证金额
if req.Amount < MinWithdrawalAmount {
if req.AmountCent < MinWithdrawalAmountCent {
return nil, ErrMinWithdrawalAmount
}
if req.Amount > MaxWithdrawalAmount {
if req.AmountCent > MaxWithdrawalAmountCent {
return nil, ErrMaxWithdrawalAmount
}