Wallet与Withdrawal模块:完成分字段重构
核心改造: 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:
@@ -4,17 +4,17 @@ import "time"
|
|||||||
|
|
||||||
type AccountDTO struct {
|
type AccountDTO struct {
|
||||||
UserID uint64 `json:"user_id"`
|
UserID uint64 `json:"user_id"`
|
||||||
AvailableBalance float64 `json:"available_balance"`
|
AvailableBalanceCent int64 `json:"available_balance_cent"`
|
||||||
FrozenBalance float64 `json:"frozen_balance"`
|
FrozenBalanceCent int64 `json:"frozen_balance_cent"`
|
||||||
Status string `json:"status"`
|
Status string `json:"status"`
|
||||||
}
|
}
|
||||||
|
|
||||||
type RechargeRequest struct {
|
type RechargeRequest struct {
|
||||||
Amount float64 `json:"amount" binding:"required"`
|
AmountCent int64 `json:"amount_cent" binding:"required"`
|
||||||
}
|
}
|
||||||
|
|
||||||
type WithdrawRequest struct {
|
type WithdrawRequest struct {
|
||||||
Amount float64 `json:"amount" binding:"required"`
|
AmountCent int64 `json:"amount_cent" binding:"required"`
|
||||||
}
|
}
|
||||||
|
|
||||||
type LedgerDTO struct {
|
type LedgerDTO struct {
|
||||||
@@ -23,8 +23,8 @@ type LedgerDTO struct {
|
|||||||
UserID uint64 `json:"user_id"`
|
UserID uint64 `json:"user_id"`
|
||||||
OrderID *uint64 `json:"order_id"`
|
OrderID *uint64 `json:"order_id"`
|
||||||
Direction string `json:"direction"`
|
Direction string `json:"direction"`
|
||||||
Amount float64 `json:"amount"`
|
AmountCent int64 `json:"amount_cent"`
|
||||||
BalanceAfter float64 `json:"balance_after"`
|
BalanceAfterCent int64 `json:"balance_after_cent"`
|
||||||
BalanceType string `json:"balance_type"`
|
BalanceType string `json:"balance_type"`
|
||||||
BizType string `json:"biz_type"`
|
BizType string `json:"biz_type"`
|
||||||
BizNo string `json:"biz_no"`
|
BizNo string `json:"biz_no"`
|
||||||
@@ -56,8 +56,8 @@ type AdminLedgerDTO struct {
|
|||||||
OrderID *uint64 `json:"order_id"`
|
OrderID *uint64 `json:"order_id"`
|
||||||
OrderNo string `json:"order_no"`
|
OrderNo string `json:"order_no"`
|
||||||
Direction string `json:"direction"`
|
Direction string `json:"direction"`
|
||||||
Amount float64 `json:"amount"`
|
AmountCent int64 `json:"amount_cent"`
|
||||||
BalanceAfter float64 `json:"balance_after"`
|
BalanceAfterCent int64 `json:"balance_after_cent"`
|
||||||
BalanceType string `json:"balance_type"`
|
BalanceType string `json:"balance_type"`
|
||||||
BizType string `json:"biz_type"`
|
BizType string `json:"biz_type"`
|
||||||
BizNo string `json:"biz_no"`
|
BizNo string `json:"biz_no"`
|
||||||
|
|||||||
@@ -21,7 +21,7 @@ type Entry struct {
|
|||||||
UserID uint64
|
UserID uint64
|
||||||
OrderID *uint64
|
OrderID *uint64
|
||||||
Direction string
|
Direction string
|
||||||
Amount float64
|
AmountCent int64
|
||||||
BalanceType string
|
BalanceType string
|
||||||
BizType string
|
BizType string
|
||||||
BizNo 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
|
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 {
|
err := r.db.Transaction(func(tx *gorm.DB) error {
|
||||||
return AppendEntries(tx, Entry{
|
return AppendEntries(tx, Entry{
|
||||||
UserID: userID,
|
UserID: userID,
|
||||||
Direction: "in",
|
Direction: "in",
|
||||||
Amount: amount,
|
AmountCent: amountCent,
|
||||||
BalanceType: "available",
|
BalanceType: "available",
|
||||||
BizType: "dev_recharge",
|
BizType: "dev_recharge",
|
||||||
BizNo: "DEV",
|
BizNo: "DEV",
|
||||||
@@ -85,7 +85,6 @@ func (r *Repository) ConfirmRechargeFromChannel(userID uint64, bizNo string, amo
|
|||||||
if userID == 0 || amountCent <= 0 || bizNo == "" {
|
if userID == 0 || amountCent <= 0 || bizNo == "" {
|
||||||
return ErrInvalidAmount
|
return ErrInvalidAmount
|
||||||
}
|
}
|
||||||
amount := roundWalletMoney(float64(amountCent) / 100)
|
|
||||||
return r.db.Transaction(func(tx *gorm.DB) error {
|
return r.db.Transaction(func(tx *gorm.DB) error {
|
||||||
if err := ensureAccount(tx, userID); err != nil {
|
if err := ensureAccount(tx, userID); err != nil {
|
||||||
return err
|
return err
|
||||||
@@ -108,7 +107,7 @@ func (r *Repository) ConfirmRechargeFromChannel(userID uint64, bizNo string, amo
|
|||||||
return AppendEntries(tx, Entry{
|
return AppendEntries(tx, Entry{
|
||||||
UserID: userID,
|
UserID: userID,
|
||||||
Direction: "in",
|
Direction: "in",
|
||||||
Amount: amount,
|
AmountCent: amountCent,
|
||||||
BalanceType: "available",
|
BalanceType: "available",
|
||||||
BizType: "channel_recharge",
|
BizType: "channel_recharge",
|
||||||
BizNo: bizNo,
|
BizNo: bizNo,
|
||||||
@@ -118,16 +117,15 @@ func (r *Repository) ConfirmRechargeFromChannel(userID uint64, bizNo string, amo
|
|||||||
}
|
}
|
||||||
|
|
||||||
// Withdraw 保留仓库能力;当前公开提现入口在 service 层标记为待开发,不会调用到这里。
|
// Withdraw 保留仓库能力;当前公开提现入口在 service 层标记为待开发,不会调用到这里。
|
||||||
func (r *Repository) Withdraw(userID uint64, amount float64) (*AccountDTO, error) {
|
func (r *Repository) Withdraw(userID uint64, amountCent int64) (*AccountDTO, error) {
|
||||||
amount = roundWalletMoney(amount)
|
if userID == 0 || amountCent <= 0 {
|
||||||
if userID == 0 || amount <= 0 {
|
|
||||||
return nil, ErrInvalidAmount
|
return nil, ErrInvalidAmount
|
||||||
}
|
}
|
||||||
err := r.db.Transaction(func(tx *gorm.DB) error {
|
err := r.db.Transaction(func(tx *gorm.DB) error {
|
||||||
return AppendEntries(tx, Entry{
|
return AppendEntries(tx, Entry{
|
||||||
UserID: userID,
|
UserID: userID,
|
||||||
Direction: "out",
|
Direction: "out",
|
||||||
Amount: amount,
|
AmountCent: amountCent,
|
||||||
BalanceType: "available",
|
BalanceType: "available",
|
||||||
BizType: "withdraw_apply",
|
BizType: "withdraw_apply",
|
||||||
BizNo: fmt.Sprintf("WD%d", time.Now().UnixNano()),
|
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").
|
db := r.db.Table("wallet_ledger AS wl").
|
||||||
Select(`wl.id, wl.ledger_no, wl.user_id, COALESCE(u.phone, '') AS user_phone,
|
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,
|
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`).
|
wl.remark, wl.created_at`).
|
||||||
Joins("LEFT JOIN users AS u ON u.id = wl.user_id").
|
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")
|
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 {
|
func AppendEntries(tx *gorm.DB, entries ...Entry) error {
|
||||||
for _, entry := range entries {
|
for _, entry := range entries {
|
||||||
entry.Amount = roundWalletMoney(entry.Amount)
|
if entry.AmountCent <= 0 {
|
||||||
if entry.Amount <= 0 {
|
|
||||||
continue
|
continue
|
||||||
}
|
}
|
||||||
if err := ensureAccount(tx, entry.UserID); err != nil {
|
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 {
|
if err := tx.Clauses(clause.Locking{Strength: "UPDATE"}).Where("user_id = ?", entry.UserID).First(&account).Error; err != nil {
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
balanceAfter, err := applyEntry(&account, entry)
|
balanceAfterCent, err := applyEntry(&account, entry)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
@@ -205,8 +202,8 @@ func AppendEntries(tx *gorm.DB, entries ...Entry) error {
|
|||||||
UserID: entry.UserID,
|
UserID: entry.UserID,
|
||||||
OrderID: entry.OrderID,
|
OrderID: entry.OrderID,
|
||||||
Direction: entry.Direction,
|
Direction: entry.Direction,
|
||||||
Amount: entry.Amount,
|
AmountCent: entry.AmountCent,
|
||||||
BalanceAfter: balanceAfter,
|
BalanceAfterCent: balanceAfterCent,
|
||||||
BalanceType: entry.BalanceType,
|
BalanceType: entry.BalanceType,
|
||||||
BizType: entry.BizType,
|
BizType: entry.BizType,
|
||||||
BizNo: entry.BizNo,
|
BizNo: entry.BizNo,
|
||||||
@@ -222,38 +219,35 @@ func AppendEntries(tx *gorm.DB, entries ...Entry) error {
|
|||||||
func ensureAccount(tx *gorm.DB, userID uint64) error {
|
func ensureAccount(tx *gorm.DB, userID uint64) error {
|
||||||
account := model.WalletAccount{
|
account := model.WalletAccount{
|
||||||
UserID: userID,
|
UserID: userID,
|
||||||
AvailableBalance: 0,
|
AvailableBalanceCent: 0,
|
||||||
FrozenBalance: 0,
|
FrozenBalanceCent: 0,
|
||||||
Status: "active",
|
Status: "active",
|
||||||
}
|
}
|
||||||
return tx.Clauses(clause.OnConflict{DoNothing: true}).Create(&account).Error
|
return tx.Clauses(clause.OnConflict{DoNothing: true}).Create(&account).Error
|
||||||
}
|
}
|
||||||
|
|
||||||
func applyEntry(account *model.WalletAccount, entry Entry) (float64, error) {
|
func applyEntry(account *model.WalletAccount, entry Entry) (int64, error) {
|
||||||
entry.Amount = roundWalletMoney(entry.Amount)
|
|
||||||
account.AvailableBalance = roundWalletMoney(account.AvailableBalance)
|
|
||||||
account.FrozenBalance = roundWalletMoney(account.FrozenBalance)
|
|
||||||
switch entry.BalanceType {
|
switch entry.BalanceType {
|
||||||
case "available":
|
case "available":
|
||||||
if entry.Direction == "in" {
|
if entry.Direction == "in" {
|
||||||
account.AvailableBalance = roundWalletMoney(account.AvailableBalance + entry.Amount)
|
account.AvailableBalanceCent += entry.AmountCent
|
||||||
} else {
|
} else {
|
||||||
if account.AvailableBalance < entry.Amount {
|
if account.AvailableBalanceCent < entry.AmountCent {
|
||||||
return 0, ErrInsufficientBalance
|
return 0, ErrInsufficientBalance
|
||||||
}
|
}
|
||||||
account.AvailableBalance = roundWalletMoney(account.AvailableBalance - entry.Amount)
|
account.AvailableBalanceCent -= entry.AmountCent
|
||||||
}
|
}
|
||||||
return account.AvailableBalance, nil
|
return account.AvailableBalanceCent, nil
|
||||||
case "frozen":
|
case "frozen":
|
||||||
if entry.Direction == "in" {
|
if entry.Direction == "in" {
|
||||||
account.FrozenBalance = roundWalletMoney(account.FrozenBalance + entry.Amount)
|
account.FrozenBalanceCent += entry.AmountCent
|
||||||
} else {
|
} else {
|
||||||
if account.FrozenBalance < entry.Amount {
|
if account.FrozenBalanceCent < entry.AmountCent {
|
||||||
return 0, ErrInsufficientBalance
|
return 0, ErrInsufficientBalance
|
||||||
}
|
}
|
||||||
account.FrozenBalance = roundWalletMoney(account.FrozenBalance - entry.Amount)
|
account.FrozenBalanceCent -= entry.AmountCent
|
||||||
}
|
}
|
||||||
return account.FrozenBalance, nil
|
return account.FrozenBalanceCent, nil
|
||||||
default:
|
default:
|
||||||
return 0, fmt.Errorf("unsupported balance type: %s", entry.BalanceType)
|
return 0, fmt.Errorf("unsupported balance type: %s", entry.BalanceType)
|
||||||
}
|
}
|
||||||
@@ -266,8 +260,8 @@ func roundWalletMoney(value float64) float64 {
|
|||||||
func toAccountDTO(account model.WalletAccount) *AccountDTO {
|
func toAccountDTO(account model.WalletAccount) *AccountDTO {
|
||||||
return &AccountDTO{
|
return &AccountDTO{
|
||||||
UserID: account.UserID,
|
UserID: account.UserID,
|
||||||
AvailableBalance: account.AvailableBalance,
|
AvailableBalanceCent: account.AvailableBalanceCent,
|
||||||
FrozenBalance: account.FrozenBalance,
|
FrozenBalanceCent: account.FrozenBalanceCent,
|
||||||
Status: account.Status,
|
Status: account.Status,
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -279,8 +273,8 @@ func toLedgerDTO(row model.WalletLedger) LedgerDTO {
|
|||||||
UserID: row.UserID,
|
UserID: row.UserID,
|
||||||
OrderID: row.OrderID,
|
OrderID: row.OrderID,
|
||||||
Direction: row.Direction,
|
Direction: row.Direction,
|
||||||
Amount: row.Amount,
|
AmountCent: row.AmountCent,
|
||||||
BalanceAfter: row.BalanceAfter,
|
BalanceAfterCent: row.BalanceAfterCent,
|
||||||
BalanceType: row.BalanceType,
|
BalanceType: row.BalanceType,
|
||||||
BizType: row.BizType,
|
BizType: row.BizType,
|
||||||
BizNo: row.BizNo,
|
BizNo: row.BizNo,
|
||||||
|
|||||||
@@ -10,7 +10,8 @@ var (
|
|||||||
ErrRechargeDisabled = errors.New("wallet recharge disabled")
|
ErrRechargeDisabled = errors.New("wallet recharge disabled")
|
||||||
)
|
)
|
||||||
|
|
||||||
const MinRechargeAmount = 0.01
|
// MinRechargeAmountCent 最小充值金额:1分
|
||||||
|
const MinRechargeAmountCent = 1
|
||||||
|
|
||||||
type Service struct {
|
type Service struct {
|
||||||
repo *Repository
|
repo *Repository
|
||||||
|
|||||||
@@ -9,9 +9,9 @@ type WithdrawalDTO struct {
|
|||||||
ID uint64 `json:"id"`
|
ID uint64 `json:"id"`
|
||||||
WithdrawNo string `json:"withdraw_no"`
|
WithdrawNo string `json:"withdraw_no"`
|
||||||
UserID uint64 `json:"user_id"`
|
UserID uint64 `json:"user_id"`
|
||||||
Amount float64 `json:"amount"`
|
AmountCent int64 `json:"amount_cent"`
|
||||||
Fee float64 `json:"fee"`
|
FeeCent int64 `json:"fee_cent"`
|
||||||
ActualAmount float64 `json:"actual_amount"`
|
ActualAmountCent int64 `json:"actual_amount_cent"`
|
||||||
AccountType string `json:"account_type"`
|
AccountType string `json:"account_type"`
|
||||||
AccountName string `json:"account_name"`
|
AccountName string `json:"account_name"`
|
||||||
AccountNo string `json:"account_no"` // 脱敏
|
AccountNo string `json:"account_no"` // 脱敏
|
||||||
@@ -31,9 +31,9 @@ type WithdrawalDetailDTO struct {
|
|||||||
UserID uint64 `json:"user_id"`
|
UserID uint64 `json:"user_id"`
|
||||||
UserNickname string `json:"user_nickname"`
|
UserNickname string `json:"user_nickname"`
|
||||||
UserPhone string `json:"user_phone"`
|
UserPhone string `json:"user_phone"`
|
||||||
Amount float64 `json:"amount"`
|
AmountCent int64 `json:"amount_cent"`
|
||||||
Fee float64 `json:"fee"`
|
FeeCent int64 `json:"fee_cent"`
|
||||||
ActualAmount float64 `json:"actual_amount"`
|
ActualAmountCent int64 `json:"actual_amount_cent"`
|
||||||
PaymentAccountID *uint64 `json:"payment_account_id"`
|
PaymentAccountID *uint64 `json:"payment_account_id"`
|
||||||
AccountType string `json:"account_type"`
|
AccountType string `json:"account_type"`
|
||||||
AccountName string `json:"account_name"`
|
AccountName string `json:"account_name"`
|
||||||
@@ -57,7 +57,7 @@ type WithdrawalDetailDTO struct {
|
|||||||
|
|
||||||
type CreateWithdrawalRequest struct {
|
type CreateWithdrawalRequest struct {
|
||||||
PaymentAccountID uint64 `json:"payment_account_id" binding:"required"`
|
PaymentAccountID uint64 `json:"payment_account_id" binding:"required"`
|
||||||
Amount float64 `json:"amount" binding:"required,gt=0"`
|
AmountCent int64 `json:"amount_cent" binding:"required,gt=0"`
|
||||||
}
|
}
|
||||||
|
|
||||||
type ReviewWithdrawalRequest struct {
|
type ReviewWithdrawalRequest struct {
|
||||||
|
|||||||
@@ -39,9 +39,9 @@ func (r *Repository) Create(userID uint64, req CreateWithdrawalRequest) (*Withdr
|
|||||||
return nil, err
|
return nil, err
|
||||||
}
|
}
|
||||||
|
|
||||||
// 计算手续费和实际到账金额
|
// 计算手续费和实际到账金额(分)
|
||||||
fee := req.Amount * WithdrawalFeeRate
|
feeCent := int64(float64(req.AmountCent) * WithdrawalFeeRate)
|
||||||
actualAmount := req.Amount - fee
|
actualAmountCent := req.AmountCent - feeCent
|
||||||
|
|
||||||
// 生成提现单号
|
// 生成提现单号
|
||||||
withdrawNo, err := generateWithdrawNo()
|
withdrawNo, err := generateWithdrawNo()
|
||||||
@@ -58,9 +58,9 @@ func (r *Repository) Create(userID uint64, req CreateWithdrawalRequest) (*Withdr
|
|||||||
withdrawal := model.WithdrawalRequest{
|
withdrawal := model.WithdrawalRequest{
|
||||||
WithdrawNo: withdrawNo,
|
WithdrawNo: withdrawNo,
|
||||||
UserID: userID,
|
UserID: userID,
|
||||||
Amount: req.Amount,
|
AmountCent: req.AmountCent,
|
||||||
Fee: fee,
|
FeeCent: feeCent,
|
||||||
ActualAmount: actualAmount,
|
ActualAmountCent: actualAmountCent,
|
||||||
PaymentAccountID: &req.PaymentAccountID,
|
PaymentAccountID: &req.PaymentAccountID,
|
||||||
AccountType: paymentAccount.AccountType,
|
AccountType: paymentAccount.AccountType,
|
||||||
AccountName: paymentAccount.AccountName,
|
AccountName: paymentAccount.AccountName,
|
||||||
@@ -81,7 +81,7 @@ func (r *Repository) Create(userID uint64, req CreateWithdrawalRequest) (*Withdr
|
|||||||
if err := wallet.AppendEntries(tx, wallet.Entry{
|
if err := wallet.AppendEntries(tx, wallet.Entry{
|
||||||
UserID: userID,
|
UserID: userID,
|
||||||
Direction: "out",
|
Direction: "out",
|
||||||
Amount: req.Amount,
|
AmountCent: req.AmountCent,
|
||||||
BalanceType: "available",
|
BalanceType: "available",
|
||||||
BizType: "withdraw_freeze",
|
BizType: "withdraw_freeze",
|
||||||
BizNo: withdrawNo,
|
BizNo: withdrawNo,
|
||||||
@@ -89,7 +89,7 @@ func (r *Repository) Create(userID uint64, req CreateWithdrawalRequest) (*Withdr
|
|||||||
}, wallet.Entry{
|
}, wallet.Entry{
|
||||||
UserID: userID,
|
UserID: userID,
|
||||||
Direction: "in",
|
Direction: "in",
|
||||||
Amount: req.Amount,
|
AmountCent: req.AmountCent,
|
||||||
BalanceType: "frozen",
|
BalanceType: "frozen",
|
||||||
BizType: "withdraw_freeze",
|
BizType: "withdraw_freeze",
|
||||||
BizNo: withdrawNo,
|
BizNo: withdrawNo,
|
||||||
@@ -179,7 +179,7 @@ func (r *Repository) Cancel(userID, id uint64) error {
|
|||||||
if err := wallet.AppendEntries(tx, wallet.Entry{
|
if err := wallet.AppendEntries(tx, wallet.Entry{
|
||||||
UserID: userID,
|
UserID: userID,
|
||||||
Direction: "out",
|
Direction: "out",
|
||||||
Amount: withdrawal.Amount,
|
AmountCent: withdrawal.AmountCent,
|
||||||
BalanceType: "frozen",
|
BalanceType: "frozen",
|
||||||
BizType: "withdraw_cancel",
|
BizType: "withdraw_cancel",
|
||||||
BizNo: withdrawal.WithdrawNo,
|
BizNo: withdrawal.WithdrawNo,
|
||||||
@@ -187,7 +187,7 @@ func (r *Repository) Cancel(userID, id uint64) error {
|
|||||||
}, wallet.Entry{
|
}, wallet.Entry{
|
||||||
UserID: userID,
|
UserID: userID,
|
||||||
Direction: "in",
|
Direction: "in",
|
||||||
Amount: withdrawal.Amount,
|
AmountCent: withdrawal.AmountCent,
|
||||||
BalanceType: "available",
|
BalanceType: "available",
|
||||||
BizType: "withdraw_cancel",
|
BizType: "withdraw_cancel",
|
||||||
BizNo: withdrawal.WithdrawNo,
|
BizNo: withdrawal.WithdrawNo,
|
||||||
@@ -292,7 +292,7 @@ func (r *Repository) Review(adminID, id uint64, req ReviewWithdrawalRequest) (*W
|
|||||||
if err := wallet.AppendEntries(tx, wallet.Entry{
|
if err := wallet.AppendEntries(tx, wallet.Entry{
|
||||||
UserID: withdrawal.UserID,
|
UserID: withdrawal.UserID,
|
||||||
Direction: "out",
|
Direction: "out",
|
||||||
Amount: withdrawal.Amount,
|
AmountCent: withdrawal.AmountCent,
|
||||||
BalanceType: "frozen",
|
BalanceType: "frozen",
|
||||||
BizType: "withdraw_reject",
|
BizType: "withdraw_reject",
|
||||||
BizNo: withdrawal.WithdrawNo,
|
BizNo: withdrawal.WithdrawNo,
|
||||||
@@ -300,7 +300,7 @@ func (r *Repository) Review(adminID, id uint64, req ReviewWithdrawalRequest) (*W
|
|||||||
}, wallet.Entry{
|
}, wallet.Entry{
|
||||||
UserID: withdrawal.UserID,
|
UserID: withdrawal.UserID,
|
||||||
Direction: "in",
|
Direction: "in",
|
||||||
Amount: withdrawal.Amount,
|
AmountCent: withdrawal.AmountCent,
|
||||||
BalanceType: "available",
|
BalanceType: "available",
|
||||||
BizType: "withdraw_reject",
|
BizType: "withdraw_reject",
|
||||||
BizNo: withdrawal.WithdrawNo,
|
BizNo: withdrawal.WithdrawNo,
|
||||||
@@ -351,7 +351,7 @@ func (r *Repository) ConfirmPayment(adminID, id uint64, req ConfirmPaymentReques
|
|||||||
if err := wallet.AppendEntries(tx, wallet.Entry{
|
if err := wallet.AppendEntries(tx, wallet.Entry{
|
||||||
UserID: withdrawal.UserID,
|
UserID: withdrawal.UserID,
|
||||||
Direction: "out",
|
Direction: "out",
|
||||||
Amount: withdrawal.Amount,
|
AmountCent: withdrawal.AmountCent,
|
||||||
BalanceType: "frozen",
|
BalanceType: "frozen",
|
||||||
BizType: "withdraw_complete",
|
BizType: "withdraw_complete",
|
||||||
BizNo: withdrawal.WithdrawNo,
|
BizNo: withdrawal.WithdrawNo,
|
||||||
@@ -376,9 +376,9 @@ func toDTO(w model.WithdrawalRequest) WithdrawalDTO {
|
|||||||
ID: w.ID,
|
ID: w.ID,
|
||||||
WithdrawNo: w.WithdrawNo,
|
WithdrawNo: w.WithdrawNo,
|
||||||
UserID: w.UserID,
|
UserID: w.UserID,
|
||||||
Amount: w.Amount,
|
AmountCent: w.AmountCent,
|
||||||
Fee: w.Fee,
|
FeeCent: w.FeeCent,
|
||||||
ActualAmount: w.ActualAmount,
|
ActualAmountCent: w.ActualAmountCent,
|
||||||
AccountType: w.AccountType,
|
AccountType: w.AccountType,
|
||||||
AccountName: w.AccountName,
|
AccountName: w.AccountName,
|
||||||
AccountNo: w.AccountNo,
|
AccountNo: w.AccountNo,
|
||||||
@@ -440,9 +440,9 @@ func (r *Repository) toDetailDTO(w model.WithdrawalRequest) (*WithdrawalDetailDT
|
|||||||
UserID: w.UserID,
|
UserID: w.UserID,
|
||||||
UserNickname: user.Nickname,
|
UserNickname: user.Nickname,
|
||||||
UserPhone: user.Phone,
|
UserPhone: user.Phone,
|
||||||
Amount: w.Amount,
|
AmountCent: w.AmountCent,
|
||||||
Fee: w.Fee,
|
FeeCent: w.FeeCent,
|
||||||
ActualAmount: w.ActualAmount,
|
ActualAmountCent: w.ActualAmountCent,
|
||||||
PaymentAccountID: w.PaymentAccountID,
|
PaymentAccountID: w.PaymentAccountID,
|
||||||
AccountType: w.AccountType,
|
AccountType: w.AccountType,
|
||||||
AccountName: w.AccountName,
|
AccountName: w.AccountName,
|
||||||
|
|||||||
@@ -14,8 +14,8 @@ var (
|
|||||||
)
|
)
|
||||||
|
|
||||||
const (
|
const (
|
||||||
MinWithdrawalAmount = 10.0 // 最低提现金额
|
MinWithdrawalAmountCent = 1000 // 最低提现金额:10元 = 1000分
|
||||||
MaxWithdrawalAmount = 5000.0 // 单笔最高提现金额
|
MaxWithdrawalAmountCent = 500000 // 单笔最高提现金额:5000元 = 500000分
|
||||||
WithdrawalFeeRate = 0.0 // 手续费率(暂时0%)
|
WithdrawalFeeRate = 0.0 // 手续费率(暂时0%)
|
||||||
)
|
)
|
||||||
|
|
||||||
@@ -34,10 +34,10 @@ func (s *Service) Create(userID uint64, req CreateWithdrawalRequest) (*Withdrawa
|
|||||||
}
|
}
|
||||||
|
|
||||||
// 验证金额
|
// 验证金额
|
||||||
if req.Amount < MinWithdrawalAmount {
|
if req.AmountCent < MinWithdrawalAmountCent {
|
||||||
return nil, ErrMinWithdrawalAmount
|
return nil, ErrMinWithdrawalAmount
|
||||||
}
|
}
|
||||||
if req.Amount > MaxWithdrawalAmount {
|
if req.AmountCent > MaxWithdrawalAmountCent {
|
||||||
return nil, ErrMaxWithdrawalAmount
|
return nil, ErrMaxWithdrawalAmount
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user