v1.0

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

@@ -6,7 +6,6 @@ import (
 	"ycc-server/app/main/model"
 	"ycc-server/common/ctxdata"
 	"ycc-server/common/xerr"
-	"ycc-server/pkg/lzkit/lzUtils"
 
 	"github.com/pkg/errors"
 	"github.com/zeromicro/go-zero/core/stores/sqlx"
@@ -55,8 +54,14 @@ func (l *ApplyUpgradeLogic) ApplyUpgrade(req *types.ApplyUpgradeReq) (resp *type
 	}
 
 	// 3. 计算升级费用和返佣
-	upgradeFee := l.svcCtx.AgentService.GetUpgradeFee(fromLevel, toLevel)
-	rebateAmount := l.svcCtx.AgentService.GetUpgradeRebate(fromLevel, toLevel)
+	upgradeFee, err := l.svcCtx.AgentService.GetUpgradeFee(l.ctx, fromLevel, toLevel)
+	if err != nil {
+		return nil, errors.Wrapf(err, "获取升级费用失败")
+	}
+	rebateAmount, err := l.svcCtx.AgentService.GetUpgradeRebate(l.ctx, fromLevel, toLevel)
+	if err != nil {
+		return nil, errors.Wrapf(err, "获取升级返佣金额失败")
+	}
 
 	// 4. 查找原直接上级（用于返佣）
 	var rebateAgentId int64
@@ -68,18 +73,18 @@ func (l *ApplyUpgradeLogic) ApplyUpgrade(req *types.ApplyUpgradeReq) (resp *type
 		rebateAgentId = parent.Id
 	}
 
-	// 5. 使用事务处理升级
+	// 5. 创建升级记录（待支付状态）
 	var upgradeId int64
 	err = l.svcCtx.AgentWalletModel.Trans(l.ctx, func(transCtx context.Context, session sqlx.Session) error {
-		// 5.1 创建升级记录
+		// 5.1 创建升级记录（状态为待支付）
 		upgradeRecord := &model.AgentUpgrade{
-			AgentId:       agent.Id,
-			FromLevel:     fromLevel,
-			ToLevel:       toLevel,
-			UpgradeType:   1, // 自主付费
-			UpgradeFee:    upgradeFee,
-			RebateAmount:  rebateAmount,
-			Status:        1, // 待处理
+			AgentId:      agent.Id,
+			FromLevel:    fromLevel,
+			ToLevel:      toLevel,
+			UpgradeType:  1, // 自主付费
+			UpgradeFee:   upgradeFee,
+			RebateAmount: rebateAmount,
+			Status:       1, // 待支付（1=待支付，2=已支付，3=已完成，4=已取消）
 		}
 		if rebateAgentId > 0 {
 			upgradeRecord.RebateAgentId = sql.NullInt64{Int64: rebateAgentId, Valid: true}
@@ -91,23 +96,7 @@ func (l *ApplyUpgradeLogic) ApplyUpgrade(req *types.ApplyUpgradeReq) (resp *type
 		}
 		upgradeId, _ = upgradeResult.LastInsertId()
 
-		// 5.2 处理支付（这里假设支付已在外层处理，只记录订单号）
-		// 实际支付应该在创建升级记录之前完成
-		// 注意：支付订单号需要从支付回调中获取，这里暂时留空
-
-		// 5.3 执行升级操作
-		if err := l.svcCtx.AgentService.ProcessUpgrade(transCtx, agent.Id, toLevel, 1, upgradeFee, rebateAmount, "", 0); err != nil {
-			return errors.Wrapf(err, "执行升级操作失败")
-		}
-
-		// 5.4 更新升级记录状态
-		upgradeRecord.Id = upgradeId
-		upgradeRecord.Status = 2 // 已完成
-		upgradeRecord.Remark = lzUtils.StringToNullString("升级成功")
-		if err := l.svcCtx.AgentUpgradeModel.UpdateWithVersion(transCtx, session, upgradeRecord); err != nil {
-			return errors.Wrapf(err, "更新升级记录失败")
-		}
-
+		// 注意：升级操作将在支付成功后通过支付回调完成
 		return nil
 	})
 
@@ -115,10 +104,10 @@ func (l *ApplyUpgradeLogic) ApplyUpgrade(req *types.ApplyUpgradeReq) (resp *type
 		return nil, err
 	}
 
-	// 返回响应（订单号需要从支付回调中获取，这里暂时返回空）
+	// 返回响应（订单号将在支付接口中生成）
 	return &types.ApplyUpgradeResp{
 		UpgradeId: upgradeId,
-		OrderNo:   "", // 需要从支付回调中获取
+		OrderNo:   "", // 将在支付接口中生成
 	}, nil
 }