f

app/main/api/internal/logic/agent/bankcardwithdrawallogic.go

@@ -1,13 +1,13 @@
 package agent
 
 import (
+	"bdrp-server/app/main/model"
+	"bdrp-server/common/ctxdata"
+	"bdrp-server/common/xerr"
 	"context"
 	"database/sql"
 	"regexp"
 	"time"
-	"bdrp-server/app/main/model"
-	"bdrp-server/common/ctxdata"
-	"bdrp-server/common/xerr"
 
 	"github.com/pkg/errors"
 	"github.com/zeromicro/go-zero/core/stores/sqlx"
@@ -57,6 +57,8 @@ func (l *BankCardWithdrawalLogic) BankCardWithdrawal(req *types.BankCardWithdraw
 		return nil, errors.Wrapf(xerr.NewErrMsg("开户支行不能为空"), "开户支行验证失败")
 	}
 
+	withdrawAmount := roundMoney(req.Amount)
+
 	// 使用事务处理核心操作
 	err = l.svcCtx.AgentModel.Trans(l.ctx, func(ctx context.Context, session sqlx.Session) error {
 		userID, err := ctxdata.GetUidFromCtx(l.ctx)
@@ -90,12 +92,12 @@ func (l *BankCardWithdrawalLogic) BankCardWithdrawal(req *types.BankCardWithdraw
 		}
 
 		// 校验可提现金额
-		if req.Amount > agentWallet.Balance {
+		if withdrawAmount > roundMoney(agentWallet.Balance) {
 			return errors.Wrapf(xerr.NewErrMsg("您可提现的余额不足"), "余额不足")
 		}
 
 		// 最低提现金额验证
-		if req.Amount < 50 {
+		if withdrawAmount < 50 {
 			return errors.Wrapf(xerr.NewErrMsg("提现金额不能低于50元"), "金额验证失败")
 		}
 
@@ -103,7 +105,7 @@ func (l *BankCardWithdrawalLogic) BankCardWithdrawal(req *types.BankCardWithdraw
 		outBizNo = "BC_" + l.svcCtx.AlipayService.GenerateOutTradeNo()
 
 		// 冻结资金（事务内操作）
-		if err = l.freezeFunds(session, agentWallet, req.Amount); err != nil {
+		if err = l.freezeFunds(session, agentWallet, withdrawAmount); err != nil {
 			return errors.Wrapf(xerr.NewErrCode(xerr.DB_ERROR), "资金冻结失败: %v", err)
 		}
 
@@ -118,14 +120,14 @@ func (l *BankCardWithdrawalLogic) BankCardWithdrawal(req *types.BankCardWithdraw
 		)
 
 		// 统一扣税逻辑：所有提现都按6%收取税收
-		exemptionAmount = 0                          // 免税金额 = 0
-		TaxStatus = model.TaxStatusPending           // 扣税状态 = 待扣税
-		taxDeductionPart = req.Amount                // 应税金额 = 提现金额
-		taxAmount = taxDeductionPart * taxRate       // 应缴税费 = 应税金额 * 税率
-		finalWithdrawAmount = req.Amount - taxAmount // 实际到账金额 = 提现金额 - 应缴税费
+		exemptionAmount = 0                                          // 免税金额 = 0
+		TaxStatus = model.TaxStatusPending                           // 扣税状态 = 待扣税
+		taxDeductionPart = withdrawAmount                            // 应税金额 = 提现金额
+		taxAmount = roundMoney(taxDeductionPart * taxRate)           // 应缴税费 = 应税金额 * 税率
+		finalWithdrawAmount = roundMoney(withdrawAmount - taxAmount) // 实际到账金额 = 提现金额 - 应缴税费
 
 		// 创建提现记录（初始状态为申请中，提现类型为银行卡）
-		withdrawalID, err := l.createBankCardWithdrawalRecord(session, agentModel.Id, req.BankCardNo, req.BankName, agentRealName.Name, req.Amount, finalWithdrawAmount, taxAmount, outBizNo)
+		withdrawalID, err := l.createBankCardWithdrawalRecord(session, agentModel.Id, req.BankCardNo, req.BankName, agentRealName.Name, withdrawAmount, finalWithdrawAmount, taxAmount, outBizNo)
 		if err != nil {
 			return errors.Wrapf(xerr.NewErrCode(xerr.DB_ERROR), "创建提现记录失败: %v", err)
 		}
@@ -135,7 +137,7 @@ func (l *BankCardWithdrawalLogic) BankCardWithdrawal(req *types.BankCardWithdraw
 			AgentId:           agentModel.Id,
 			YearMonth:         yearMonth,
 			WithdrawalId:      withdrawalID,
-			WithdrawalAmount:  req.Amount,
+			WithdrawalAmount:  withdrawAmount,
 			ExemptionAmount:   exemptionAmount,
 			TaxableAmount:     taxDeductionPart,
 			TaxRate:           taxRate,
@@ -160,7 +162,7 @@ func (l *BankCardWithdrawalLogic) BankCardWithdrawal(req *types.BankCardWithdraw
 	withdrawRes.Status = WithdrawStatusProcessing
 	withdrawRes.FailMsg = ""
 
-	l.Logger.Infof("银行卡提现申请成功 outBizNo:%s agentId:%d amount:%f", outBizNo, agentID, req.Amount)
+	l.Logger.Infof("银行卡提现申请成功 outBizNo:%s agentId:%d amount:%f", outBizNo, agentID, withdrawAmount)
 	return withdrawRes, nil
 }
 
@@ -171,9 +173,9 @@ func (l *BankCardWithdrawalLogic) createBankCardWithdrawalRecord(session sqlx.Se
 		WithdrawType: WithdrawTypeBankCard, // 银行卡提现
 		WithdrawNo:   outBizNo,
 		PayeeAccount: bankCardNo, // 银行卡号存储在PayeeAccount字段
-		Amount:       amount,
-		ActualAmount: finalWithdrawAmount,
-		TaxAmount:    taxAmount,
+		Amount:       roundMoney(amount),
+		ActualAmount: roundMoney(finalWithdrawAmount),
+		TaxAmount:    roundMoney(taxAmount),
 		Status:       StatusProcessing, // 申请中状态
 		BankCardNo:   sql.NullString{String: bankCardNo, Valid: true},
 		BankName:     sql.NullString{String: bankName, Valid: true},
@@ -194,8 +196,8 @@ func (l *BankCardWithdrawalLogic) freezeFunds(session sqlx.Session, wallet *mode
 	frozenBalanceBefore := wallet.FrozenBalance
 
 	// 更新钱包余额
-	wallet.Balance -= amount
-	wallet.FrozenBalance += amount
+	wallet.Balance = roundMoney(wallet.Balance - amount)
+	wallet.FrozenBalance = roundMoney(wallet.FrozenBalance + amount)
 	err := l.svcCtx.AgentWalletModel.UpdateWithVersion(l.ctx, session, wallet)
 	if err != nil {
 		return err
@@ -207,7 +209,7 @@ func (l *BankCardWithdrawalLogic) freezeFunds(session sqlx.Session, wallet *mode
 		session,
 		wallet.AgentId,
 		model.WalletTransactionTypeFreeze,
-		amount,               // 变动金额
+		roundMoney(amount),   // 变动金额
 		balanceBefore,        // 变动前余额
 		wallet.Balance,       // 变动后余额
 		frozenBalanceBefore,  // 变动前冻结余额