v1.1

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

@@ -10,6 +10,7 @@ import (
 	"ycc-server/common/xerr"
 	"ycc-server/pkg/lzkit/lzUtils"
 
+	"github.com/google/uuid"
 	"github.com/pkg/errors"
 	"github.com/zeromicro/go-zero/core/stores/sqlx"
 
@@ -88,7 +89,7 @@ func (l *ApplyWithdrawalLogic) ApplyWithdrawal(req *types.ApplyWithdrawalReq) (r
 	withdrawNo := fmt.Sprintf("WD%d%d", time.Now().Unix(), agent.Id)
 
 	// 8. 使用事务处理提现申请
-	var withdrawalId int64
+	var withdrawalId string
 	err = l.svcCtx.AgentWalletModel.Trans(l.ctx, func(transCtx context.Context, session sqlx.Session) error {
 		// 8.1 冻结余额
 		wallet.FrozenBalance += req.Amount
@@ -99,6 +100,7 @@ func (l *ApplyWithdrawalLogic) ApplyWithdrawal(req *types.ApplyWithdrawalReq) (r
 
 		// 8.2 创建提现记录
 		withdrawal := &model.AgentWithdrawal{
+			Id:           uuid.New().String(),
 			AgentId:      agent.Id,
 			WithdrawNo:   withdrawNo,
 			PayeeAccount: req.PayeeAccount,
@@ -109,11 +111,11 @@ func (l *ApplyWithdrawalLogic) ApplyWithdrawal(req *types.ApplyWithdrawalReq) (r
 			Status:       1, // 处理中（待审核）
 		}
 
-		withdrawalResult, err := l.svcCtx.AgentWithdrawalModel.Insert(transCtx, session, withdrawal)
+		_, err := l.svcCtx.AgentWithdrawalModel.Insert(transCtx, session, withdrawal)
 		if err != nil {
 			return errors.Wrapf(err, "创建提现记录失败")
 		}
-		withdrawalId, _ = withdrawalResult.LastInsertId()
+		withdrawalId = withdrawal.Id
 
 		// 8.3 创建扣税记录
 		taxRecord := &model.AgentWithdrawalTax{
@@ -154,7 +156,7 @@ type TaxInfo struct {
 }
 
 // calculateTax 计算税费
-func (l *ApplyWithdrawalLogic) calculateTax(ctx context.Context, agentId int64, amount float64, yearMonth int64) (*TaxInfo, error) {
+func (l *ApplyWithdrawalLogic) calculateTax(ctx context.Context, agentId string, amount float64, yearMonth int64) (*TaxInfo, error) {
 	// 获取税率配置（默认6%）
 	taxRate := 0.06
 	config, err := l.svcCtx.AgentConfigModel.FindOneByConfigKey(ctx, "tax_rate")