fix

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

@@ -6,7 +6,6 @@ import (
 	"time"
 	"ycc-server/app/main/model"
 	"ycc-server/common/ctxdata"
-	"ycc-server/common/globalkey"
 	"ycc-server/common/xerr"
 	"ycc-server/pkg/lzkit/lzUtils"
 
@@ -62,53 +61,133 @@ func (l *ApplyWithdrawalLogic) ApplyWithdrawal(req *types.ApplyWithdrawalReq) (r
 		return nil, errors.Wrapf(xerr.NewErrMsg("请先完成实名认证"), "")
 	}
 
-	// 3. 验证提现金额
+	// 3. 验证提现方式
+	if req.WithdrawalType != 1 && req.WithdrawalType != 2 {
+		return nil, errors.Wrapf(xerr.NewErrMsg("提现方式无效"), "")
+	}
+
+	// 4. 验证提现信息
+	if req.WithdrawalType == 1 {
+		// 支付宝提现：验证支付宝账号和姓名
+		if req.PayeeAccount == "" {
+			return nil, errors.Wrapf(xerr.NewErrMsg("请输入支付宝账号"), "")
+		}
+		if req.PayeeName == "" {
+			return nil, errors.Wrapf(xerr.NewErrMsg("请输入收款人姓名"), "")
+		}
+	} else if req.WithdrawalType == 2 {
+		// 银行卡提现：验证银行卡号、开户行和姓名
+		if req.BankCardNo == "" {
+			return nil, errors.Wrapf(xerr.NewErrMsg("请输入银行卡号"), "")
+		}
+		if req.BankName == "" {
+			return nil, errors.Wrapf(xerr.NewErrMsg("请输入开户行名称"), "")
+		}
+		if req.PayeeName == "" {
+			return nil, errors.Wrapf(xerr.NewErrMsg("请输入收款人姓名"), "")
+		}
+	}
+
+	// 5. 验证提现金额
 	if req.Amount <= 0 {
 		return nil, errors.Wrapf(xerr.NewErrMsg("提现金额必须大于0"), "")
 	}
 
-	// 4. 获取钱包信息
+	// 6. 获取钱包信息
 	wallet, err := l.svcCtx.AgentWalletModel.FindOneByAgentId(l.ctx, agent.Id)
 	if err != nil {
 		return nil, errors.Wrapf(xerr.NewErrCode(xerr.DB_ERROR), "查询钱包失败, %v", err)
 	}
 
-	// 5. 验证余额
+	// 7. 验证余额（包括检查是否为负数）
+	if wallet.Balance < 0 {
+		return nil, errors.Wrapf(xerr.NewErrMsg(fmt.Sprintf("账户存在欠款，请先补足欠款后再申请提现，当前余额：%.2f", wallet.Balance)), "")
+	}
 	if wallet.Balance < req.Amount {
 		return nil, errors.Wrapf(xerr.NewErrMsg(fmt.Sprintf("余额不足，当前余额：%.2f", wallet.Balance)), "")
 	}
 
-	// 6. 计算税费
+	// 8. 支付宝月度提现额度校验（仅针对支付宝提现）
+	if req.WithdrawalType == 1 {
+		now := time.Now()
+		monthStart := time.Date(now.Year(), now.Month(), 1, 0, 0, 0, 0, now.Location())
+		nextMonthStart := monthStart.AddDate(0, 1, 0)
+
+		// 8.1 获取支付宝月度额度配置（默认 800 元）
+		alipayQuota := 800.0
+		if cfg, cfgErr := l.svcCtx.AgentConfigModel.FindOneByConfigKey(l.ctx, "alipay_month_quota"); cfgErr == nil {
+			if parsed, parseErr := l.parseFloat(cfg.ConfigValue); parseErr == nil && parsed > 0 {
+				alipayQuota = parsed
+			}
+		}
+
+		// 8.2 统计本月已申请/成功的支付宝提现金额（status IN (1,5)），避免多次申请占用超额
+		withdrawBuilder := l.svcCtx.AgentWithdrawalModel.SelectBuilder().
+			Where("agent_id = ? AND withdrawal_type = ? AND status IN (1,5) AND create_time >= ? AND create_time < ?",
+				agent.Id, 1, monthStart, nextMonthStart)
+		usedAmount, sumErr := l.svcCtx.AgentWithdrawalModel.FindSum(l.ctx, withdrawBuilder, "amount")
+		if sumErr != nil {
+			return nil, errors.Wrapf(sumErr, "查询本月支付宝提现额度使用情况失败")
+		}
+
+		remainQuota := alipayQuota - usedAmount
+		if remainQuota <= 0 {
+			return nil, errors.Wrapf(
+				xerr.NewErrMsg(fmt.Sprintf("本月支付宝提现额度已用完（额度：%.2f 元），请使用银行卡提现", alipayQuota)),
+				"",
+			)
+		}
+
+		if req.Amount > remainQuota {
+			return nil, errors.Wrapf(
+				xerr.NewErrMsg(fmt.Sprintf("本月支付宝最高可提现 %.2f 元，请调整提现金额或使用银行卡提现", remainQuota)),
+				"",
+			)
+		}
+	}
+
+	// 9. 计算税费
 	yearMonth := int64(time.Now().Year()*100 + int(time.Now().Month()))
 	taxInfo, err := l.calculateTax(l.ctx, agent.Id, req.Amount, yearMonth)
 	if err != nil {
 		return nil, errors.Wrapf(err, "计算税费失败")
 	}
 
-	// 7. 生成提现单号
-	withdrawNo := fmt.Sprintf("WD%d%d", time.Now().Unix(), agent.Id)
+	// 10. 生成提现单号
+	withdrawNo := fmt.Sprintf("WD%d%s", time.Now().Unix(), agent.Id)
 
-	// 8. 使用事务处理提现申请
+	// 11. 使用事务处理提现申请
 	var withdrawalId string
 	err = l.svcCtx.AgentWalletModel.Trans(l.ctx, func(transCtx context.Context, session sqlx.Session) error {
-		// 8.1 冻结余额
+		// 11.1 冻结余额
 		wallet.FrozenBalance += req.Amount
 		wallet.Balance -= req.Amount
 		if err := l.svcCtx.AgentWalletModel.UpdateWithVersion(transCtx, session, wallet); err != nil {
 			return errors.Wrapf(err, "冻结余额失败")
 		}
 
-		// 8.2 创建提现记录
+		// 11.2 创建提现记录
 		withdrawal := &model.AgentWithdrawal{
-			Id:           uuid.New().String(),
-			AgentId:      agent.Id,
-			WithdrawNo:   withdrawNo,
-			PayeeAccount: req.PayeeAccount,
-			PayeeName:    req.PayeeName,
-			Amount:       req.Amount,
-			ActualAmount: taxInfo.ActualAmount,
-			TaxAmount:    taxInfo.TaxAmount,
-			Status:       1, // 处理中（待审核）
+			Id:             uuid.New().String(),
+			AgentId:        agent.Id,
+			WithdrawNo:     withdrawNo,
+			WithdrawalType: req.WithdrawalType,
+			PayeeAccount:   req.PayeeAccount,
+			PayeeName:      req.PayeeName,
+			Amount:         req.Amount,
+			ActualAmount:   taxInfo.ActualAmount,
+			TaxAmount:      taxInfo.TaxAmount,
+			Status:         1, // 待审核
+		}
+
+		// 如果是银行卡提现，设置银行卡相关字段
+		if req.WithdrawalType == 2 {
+			withdrawal.BankCardNo = lzUtils.StringToNullString(req.BankCardNo)
+			withdrawal.BankName = lzUtils.StringToNullString(req.BankName)
+			// 银行卡提现时，payee_account 可以存储银行卡号（便于查询），也可以留空
+			if req.PayeeAccount == "" {
+				withdrawal.PayeeAccount = req.BankCardNo
+			}
 		}
 
 		_, err := l.svcCtx.AgentWithdrawalModel.Insert(transCtx, session, withdrawal)
@@ -117,7 +196,7 @@ func (l *ApplyWithdrawalLogic) ApplyWithdrawal(req *types.ApplyWithdrawalReq) (r
 		}
 		withdrawalId = withdrawal.Id
 
-		// 8.3 创建扣税记录
+		// 11.3 创建扣税记录
 		taxRecord := &model.AgentWithdrawalTax{
 			AgentId:          agent.Id,
 			WithdrawalId:     withdrawalId,
@@ -167,8 +246,10 @@ func (l *ApplyWithdrawalLogic) calculateTax(ctx context.Context, agentId string,
 	}
 
 	// 查询本月已提现金额
+	// 注意：FindAll 方法会自动添加 del_state = ? 条件，所以这里不需要手动添加
+	// 这里对 year_month 使用反引号包裹，避免与某些数据库版本/SQL 模式下的关键字冲突
 	builder := l.svcCtx.AgentWithdrawalTaxModel.SelectBuilder().
-		Where("agent_id = ? AND year_month = ? AND del_state = ?", agentId, yearMonth, globalkey.DelStateNo)
+		Where("agent_id = ? AND `year_month` = ?", agentId, yearMonth)
 	taxRecords, err := l.svcCtx.AgentWithdrawalTaxModel.FindAll(ctx, builder, "")
 	if err != nil {
 		return nil, errors.Wrapf(err, "查询月度提现记录失败")

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

@@ -0,0 +1,91 @@
+package agent
+
+import (
+	"context"
+	"strings"
+	"ycc-server/app/main/model"
+	"ycc-server/common/xerr"
+
+	"github.com/pkg/errors"
+
+	"ycc-server/app/main/api/internal/svc"
+	"ycc-server/app/main/api/internal/types"
+
+	"github.com/zeromicro/go-zero/core/logx"
+)
+
+type CheckFeatureWhitelistStatusLogic struct {
+	logx.Logger
+	ctx    context.Context
+	svcCtx *svc.ServiceContext
+}
+
+func NewCheckFeatureWhitelistStatusLogic(ctx context.Context, svcCtx *svc.ServiceContext) *CheckFeatureWhitelistStatusLogic {
+	return &CheckFeatureWhitelistStatusLogic{
+		Logger: logx.WithContext(ctx),
+		ctx:    ctx,
+		svcCtx: svcCtx,
+	}
+}
+
+func (l *CheckFeatureWhitelistStatusLogic) CheckFeatureWhitelistStatus(req *types.CheckFeatureWhitelistStatusReq) (resp *types.CheckFeatureWhitelistStatusResp, err error) {
+	// 1. 验证参数
+	if req.IdCard == "" {
+		return nil, errors.Wrapf(xerr.NewErrMsg("身份证号不能为空"), "")
+	}
+	if req.FeatureApiId == "" {
+		return nil, errors.Wrapf(xerr.NewErrMsg("模块API标识不能为空"), "")
+	}
+
+	// 2. 提取主模块ID（去掉下划线后的部分）
+	// 例如：JRZQ7F1A_BigDataReport -> JRZQ7F1A
+	mainApiId := req.FeatureApiId
+	if idx := strings.Index(req.FeatureApiId, "_"); idx > 0 {
+		mainApiId = req.FeatureApiId[:idx]
+	}
+
+	// 3. 查询feature信息（使用主模块ID）
+	feature, err := l.svcCtx.FeatureModel.FindOneByApiId(l.ctx, mainApiId)
+	if err != nil {
+		if errors.Is(err, model.ErrNotFound) {
+			return nil, errors.Wrapf(xerr.NewErrMsg("模块不存在"), "")
+		}
+		return nil, errors.Wrapf(xerr.NewErrCode(xerr.DB_ERROR), "查询模块信息失败, %v", err)
+	}
+
+	// 4. 检查是否在白名单中（使用主模块ID）
+	whitelistBuilder := l.svcCtx.UserFeatureWhitelistModel.SelectBuilder().
+		Where("id_card = ? AND feature_api_id = ? AND status = ?", req.IdCard, mainApiId, 1)
+	whitelists, err := l.svcCtx.UserFeatureWhitelistModel.FindAll(l.ctx, whitelistBuilder, "")
+	if err != nil {
+		return nil, errors.Wrapf(xerr.NewErrCode(xerr.DB_ERROR), "查询白名单记录失败, %v", err)
+	}
+
+	isWhitelisted := len(whitelists) > 0
+
+	// 5. 如果提供了 queryId，检查当前报告数据是否已删除
+	dataDeleted := false
+	if req.QueryId != "" {
+		containsFeature, err := l.svcCtx.WhitelistService.CheckQueryDataContainsFeature(l.ctx, req.QueryId, req.FeatureApiId)
+		if err != nil {
+			// 检查失败不影响主流程，记录日志即可
+			logx.Errorf("检查报告数据是否包含模块失败：查询记录 %s，模块 %s，错误：%v", req.QueryId, req.FeatureApiId, err)
+			// 默认认为数据已删除（保守处理）
+			dataDeleted = true
+		} else {
+			// 如果数据中不包含该模块，说明数据已删除
+			dataDeleted = !containsFeature
+		}
+	} else {
+		// 未提供 queryId，无法判断数据是否已删除，默认认为已删除（保守处理）
+		dataDeleted = true
+	}
+
+	return &types.CheckFeatureWhitelistStatusResp{
+		IsWhitelisted:  isWhitelisted,
+		WhitelistPrice: feature.WhitelistPrice,
+		FeatureId:      feature.Id,
+		DataDeleted:    dataDeleted,
+	}, nil
+}
+

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

@@ -0,0 +1,169 @@
+package agent
+
+import (
+	"context"
+	"fmt"
+	"ycc-server/app/main/model"
+	"ycc-server/common/ctxdata"
+	"ycc-server/common/xerr"
+
+	"github.com/google/uuid"
+	"github.com/pkg/errors"
+	"github.com/zeromicro/go-zero/core/stores/sqlx"
+
+	"ycc-server/app/main/api/internal/svc"
+	"ycc-server/app/main/api/internal/types"
+
+	"github.com/zeromicro/go-zero/core/logx"
+)
+
+type CreateWhitelistOrderLogic struct {
+	logx.Logger
+	ctx    context.Context
+	svcCtx *svc.ServiceContext
+}
+
+func NewCreateWhitelistOrderLogic(ctx context.Context, svcCtx *svc.ServiceContext) *CreateWhitelistOrderLogic {
+	return &CreateWhitelistOrderLogic{
+		Logger: logx.WithContext(ctx),
+		ctx:    ctx,
+		svcCtx: svcCtx,
+	}
+}
+
+func (l *CreateWhitelistOrderLogic) CreateWhitelistOrder(req *types.CreateWhitelistOrderReq) (resp *types.CreateWhitelistOrderResp, err error) {
+	userID, err := ctxdata.GetUidFromCtx(l.ctx)
+	if err != nil {
+		return nil, errors.Wrapf(xerr.NewErrCode(xerr.SERVER_COMMON_ERROR), "获取用户信息失败, %v", err)
+	}
+
+	// 1. 获取代理信息并验证是否为钻石代理
+	agent, err := l.svcCtx.AgentModel.FindOneByUserId(l.ctx, userID)
+	if err != nil {
+		if errors.Is(err, model.ErrNotFound) {
+			return nil, errors.Wrapf(xerr.NewErrMsg("您不是代理"), "")
+		}
+		return nil, errors.Wrapf(xerr.NewErrCode(xerr.DB_ERROR), "查询代理信息失败, %v", err)
+	}
+
+	// 只有钻石代理可以操作
+	if agent.Level != 3 {
+		return nil, errors.Wrapf(xerr.NewErrMsg("只有钻石代理可以操作白名单"), "")
+	}
+
+	// 2. 验证参数
+	if req.IdCard == "" {
+		return nil, errors.Wrapf(xerr.NewErrMsg("身份证号不能为空"), "")
+	}
+	if len(req.FeatureIds) == 0 {
+		return nil, errors.Wrapf(xerr.NewErrMsg("请至少选择一个模块"), "")
+	}
+
+	// 3. 查询feature信息并计算总金额
+	var totalAmount float64
+	var orderItems []struct {
+		FeatureId    string
+		FeatureApiId string
+		FeatureName  string
+		Price        float64
+	}
+
+	for _, featureId := range req.FeatureIds {
+		feature, err := l.svcCtx.FeatureModel.FindOne(l.ctx, featureId)
+		if err != nil {
+			if errors.Is(err, model.ErrNotFound) {
+				return nil, errors.Wrapf(xerr.NewErrMsg(fmt.Sprintf("模块不存在: %s", featureId)), "")
+			}
+			return nil, errors.Wrapf(xerr.NewErrCode(xerr.DB_ERROR), "查询模块信息失败, %v", err)
+		}
+
+		// 直接使用feature的WhitelistPrice字段
+		whitelistPrice := feature.WhitelistPrice
+
+		if whitelistPrice <= 0 {
+			return nil, errors.Wrapf(xerr.NewErrMsg(fmt.Sprintf("模块 %s 不支持白名单屏蔽", feature.Name)), "")
+		}
+
+		// 检查该身份证号+feature是否已经存在白名单记录
+		// 注意：系统会自动处理del_state，不需要手动添加
+		whitelistBuilder := l.svcCtx.UserFeatureWhitelistModel.SelectBuilder().
+			Where("id_card = ? AND feature_id = ?", req.IdCard, featureId)
+		existing, err := l.svcCtx.UserFeatureWhitelistModel.FindAll(l.ctx, whitelistBuilder, "")
+		if err != nil {
+			return nil, errors.Wrapf(xerr.NewErrCode(xerr.DB_ERROR), "查询白名单记录失败, %v", err)
+		}
+		// 检查是否有生效的记录（status=1）
+		for _, item := range existing {
+			if item.Status == 1 {
+				return nil, errors.Wrapf(xerr.NewErrMsg(fmt.Sprintf("身份证号 %s 的模块 %s 已经加入白名单", req.IdCard, feature.Name)), "")
+			}
+		}
+
+		totalAmount += whitelistPrice
+		orderItems = append(orderItems, struct {
+			FeatureId    string
+			FeatureApiId string
+			FeatureName  string
+			Price        float64
+		}{
+			FeatureId:    feature.Id,
+			FeatureApiId: feature.ApiId,
+			FeatureName:  feature.Name,
+			Price:        whitelistPrice,
+		})
+	}
+
+	// 4. 生成订单号（白名单订单前缀 W_，限制长度不超过32）
+	base := l.svcCtx.AlipayService.GenerateOutTradeNo()
+	orderNo := "W_" + base
+	if len(orderNo) > 32 {
+		orderNo = orderNo[:32]
+	}
+
+	// 5. 使用事务创建订单和订单明细
+	var orderId string
+	err = l.svcCtx.WhitelistOrderModel.Trans(l.ctx, func(ctx context.Context, session sqlx.Session) error {
+		// 创建订单
+		order := &model.WhitelistOrder{
+			Id:          uuid.NewString(),
+			OrderNo:     orderNo,
+			UserId:      userID,
+			IdCard:      req.IdCard,
+			TotalAmount: totalAmount,
+			Status:      1, // 待支付
+		}
+		_, err := l.svcCtx.WhitelistOrderModel.Insert(ctx, session, order)
+		if err != nil {
+			return errors.Wrapf(xerr.NewErrCode(xerr.DB_ERROR), "创建订单失败, %v", err)
+		}
+		orderId = order.Id
+
+		// 创建订单明细
+		for _, item := range orderItems {
+			orderItem := &model.WhitelistOrderItem{
+				Id:           uuid.NewString(),
+				OrderId:      orderId,
+				FeatureId:    item.FeatureId,
+				FeatureApiId: item.FeatureApiId,
+				FeatureName:  item.FeatureName,
+				Price:        item.Price,
+			}
+			_, err := l.svcCtx.WhitelistOrderItemModel.Insert(ctx, session, orderItem)
+			if err != nil {
+				return errors.Wrapf(xerr.NewErrCode(xerr.DB_ERROR), "创建订单明细失败, %v", err)
+			}
+		}
+
+		return nil
+	})
+
+	if err != nil {
+		return nil, err
+	}
+
+	return &types.CreateWhitelistOrderResp{
+		OrderId:     orderId,
+		OrderNo:     orderNo,
+		TotalAmount: totalAmount,
+	}, nil
+}

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

@@ -185,7 +185,6 @@ func (l *GetConversionRateLogic) calculateConversionRate(agentId string, subordi
 func (l *GetConversionRateLogic) calculatePeriodConversion(agentId string, subordinateIds []string, periodLabel string, startTime, endTime time.Time) types.PeriodConversionData {
 	// 构建 agent_order 查询条件
 	agentOrderBuilder := l.svcCtx.AgentOrderModel.SelectBuilder().
-		Where("del_state = ?", globalkey.DelStateNo).
 		Where("create_time >= ? AND create_time < ?", startTime, endTime)
 
 	if agentId != "" {
@@ -252,8 +251,7 @@ func (l *GetConversionRateLogic) calculatePeriodConversion(agentId string, subor
 
 	// 查询订单信息
 	orderBuilder := l.svcCtx.OrderModel.SelectBuilder().
-		Where(squirrel.Eq{"id": orderIds}).
-		Where("del_state = ?", globalkey.DelStateNo)
+		Where(squirrel.Eq{"id": orderIds})
 
 	orders, err := l.svcCtx.OrderModel.FindAll(l.ctx, orderBuilder, "")
 	if err != nil && !errors.Is(err, model.ErrNotFound) {
@@ -305,9 +303,9 @@ func (l *GetConversionRateLogic) calculatePeriodConversion(agentId string, subor
 // 2. 付费量和金额：通过agent_rebate表统计（只有付费的订单才会产生返佣）
 func (l *GetConversionRateLogic) calculateSubordinatePeriodConversion(parentAgentId string, periodLabel string, startTime, endTime time.Time) types.PeriodConversionData {
 	// 1. 查询agent_rebate表：获取所有曾经给当前用户产生返佣的source_agent_id（这些代理在某个时间点是下级）
-	// 不限制时间，获取所有历史返佣记录，用于确定哪些代理曾经是下级
+	// 不限制时间，获取所有历史返佣记录，用于确定哪些代理曾经是下级（排除已取消的记录 status=3）
 	rebateBuilder := l.svcCtx.AgentRebateModel.SelectBuilder().
-		Where("agent_id = ? AND del_state = ?", parentAgentId, globalkey.DelStateNo).
+		Where("agent_id = ? AND del_state = ? AND status != ?", parentAgentId, globalkey.DelStateNo, 3).
 		Where("source_agent_id != ?", parentAgentId)
 
 	allRebates, err := l.svcCtx.AgentRebateModel.FindAll(l.ctx, rebateBuilder, "")
@@ -360,7 +358,6 @@ func (l *GetConversionRateLogic) calculateSubordinatePeriodConversion(parentAgen
 
 	// 2. 查询agent_order表：统计这些代理在时间段内的所有订单（包括未付费的）
 	agentOrderBuilder := l.svcCtx.AgentOrderModel.SelectBuilder().
-		Where("del_state = ?", globalkey.DelStateNo).
 		Where("create_time >= ? AND create_time < ?", startTime, endTime).
 		Where(squirrel.Eq{"agent_id": sourceAgentIds})
 
@@ -413,8 +410,7 @@ func (l *GetConversionRateLogic) calculateSubordinatePeriodConversion(parentAgen
 
 	// 4. 查询订单信息
 	orderBuilder := l.svcCtx.OrderModel.SelectBuilder().
-		Where(squirrel.Eq{"id": orderIds}).
-		Where("del_state = ?", globalkey.DelStateNo)
+		Where(squirrel.Eq{"id": orderIds})
 
 	orders, err := l.svcCtx.OrderModel.FindAll(l.ctx, orderBuilder, "")
 	if err != nil && !errors.Is(err, model.ErrNotFound) {
@@ -429,9 +425,9 @@ func (l *GetConversionRateLogic) calculateSubordinatePeriodConversion(parentAgen
 		}
 	}
 
-	// 5. 查询时间段内的返佣记录，获取已付费订单的金额
+	// 5. 查询时间段内的返佣记录，获取已付费订单的金额（排除已取消的记录 status=3）
 	rebateBuilder = l.svcCtx.AgentRebateModel.SelectBuilder().
-		Where("agent_id = ? AND del_state = ?", parentAgentId, globalkey.DelStateNo).
+		Where("agent_id = ? AND del_state = ? AND status != ?", parentAgentId, globalkey.DelStateNo, 3).
 		Where("source_agent_id != ?", parentAgentId).
 		Where("create_time >= ? AND create_time < ?", startTime, endTime).
 		Where(squirrel.Eq{"order_id": orderIds})

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

@@ -0,0 +1,95 @@
+package agent
+
+import (
+	"context"
+	"ycc-server/app/main/model"
+	"ycc-server/common/ctxdata"
+	"ycc-server/common/xerr"
+
+	"github.com/pkg/errors"
+
+	"ycc-server/app/main/api/internal/svc"
+	"ycc-server/app/main/api/internal/types"
+
+	"github.com/zeromicro/go-zero/core/logx"
+)
+
+type GetLastWithdrawalInfoLogic struct {
+	logx.Logger
+	ctx    context.Context
+	svcCtx *svc.ServiceContext
+}
+
+func NewGetLastWithdrawalInfoLogic(ctx context.Context, svcCtx *svc.ServiceContext) *GetLastWithdrawalInfoLogic {
+	return &GetLastWithdrawalInfoLogic{
+		Logger: logx.WithContext(ctx),
+		ctx:    ctx,
+		svcCtx: svcCtx,
+	}
+}
+
+func (l *GetLastWithdrawalInfoLogic) GetLastWithdrawalInfo(req *types.GetLastWithdrawalInfoReq) (resp *types.GetLastWithdrawalInfoResp, err error) {
+	userID, err := ctxdata.GetUidFromCtx(l.ctx)
+	if err != nil {
+		return nil, errors.Wrapf(xerr.NewErrCode(xerr.SERVER_COMMON_ERROR), "获取用户信息失败, %v", err)
+	}
+
+	// 1. 获取代理信息
+	agent, err := l.svcCtx.AgentModel.FindOneByUserId(l.ctx, userID)
+	if err != nil {
+		if errors.Is(err, model.ErrNotFound) {
+			return nil, errors.Wrapf(xerr.NewErrMsg("您不是代理"), "")
+		}
+		return nil, errors.Wrapf(xerr.NewErrCode(xerr.DB_ERROR), "查询代理信息失败, %v", err)
+	}
+
+	// 2. 验证提现方式
+	if req.WithdrawalType != 1 && req.WithdrawalType != 2 {
+		return nil, errors.Wrapf(xerr.NewErrMsg("提现方式无效"), "")
+	}
+
+	// 3. 查询该代理最近一次该类型的提现记录
+	// 注意：FindAll 方法会自动添加 del_state = ? 条件，所以这里不需要手动添加
+	builder := l.svcCtx.AgentWithdrawalModel.SelectBuilder().
+		Where("agent_id = ? AND withdrawal_type = ?", agent.Id, req.WithdrawalType).
+		OrderBy("create_time DESC").
+		Limit(1)
+
+	withdrawals, err := l.svcCtx.AgentWithdrawalModel.FindAll(l.ctx, builder, "")
+	if err != nil {
+		return nil, errors.Wrapf(xerr.NewErrCode(xerr.DB_ERROR), "查询上次提现记录失败, %v", err)
+	}
+
+	// 4. 如果没有找到记录，返回空信息
+	if len(withdrawals) == 0 {
+		return &types.GetLastWithdrawalInfoResp{
+			WithdrawalType: req.WithdrawalType,
+			PayeeAccount:   "",
+			PayeeName:      "",
+			BankCardNo:     "",
+			BankName:       "",
+		}, nil
+	}
+
+	// 5. 组装响应
+	lastWithdrawal := withdrawals[0]
+	resp = &types.GetLastWithdrawalInfoResp{
+		WithdrawalType: lastWithdrawal.WithdrawalType,
+		PayeeAccount:   lastWithdrawal.PayeeAccount,
+		PayeeName:      lastWithdrawal.PayeeName,
+		BankCardNo:     "",
+		BankName:       "",
+	}
+
+	// 如果是银行卡提现，填充银行卡信息
+	if lastWithdrawal.WithdrawalType == 2 {
+		if lastWithdrawal.BankCardNo.Valid {
+			resp.BankCardNo = lastWithdrawal.BankCardNo.String
+		}
+		if lastWithdrawal.BankName.Valid {
+			resp.BankName = lastWithdrawal.BankName.String
+		}
+	}
+
+	return resp, nil
+}

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

@@ -117,6 +117,7 @@ func (l *GetRebateListLogic) GetRebateList(req *types.GetRebateListReq) (resp *t
 			OrderNo:           orderNo,
 			RebateType:        rebate.RebateType,
 			Amount:            rebate.RebateAmount,
+			Status:            rebate.Status,
 			CreateTime:        rebate.CreateTime.Format("2006-01-02 15:04:05"),
 		})
 	}

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

@@ -2,6 +2,7 @@ package agent
 
 import (
 	"context"
+	"fmt"
 	"time"
 	"ycc-server/app/main/model"
 	"ycc-server/common/ctxdata"
@@ -57,26 +58,27 @@ func (l *GetRevenueInfoLogic) GetRevenueInfo() (resp *types.GetRevenueInfoResp,
 	todayStart := time.Date(now.Year(), now.Month(), now.Day(), 0, 0, 0, 0, now.Location())
 	// 本月开始时间（1号 00:00:00）
 	monthStart := time.Date(now.Year(), now.Month(), 1, 0, 0, 0, 0, now.Location())
+	nextMonthStart := monthStart.AddDate(0, 1, 0)
 
-	// 3. 统计佣金总额（从 agent_commission 表统计）
+	// 3. 统计佣金总额（从 agent_commission 表统计，排除已取消的记录 status=3）
 	commissionBuilder := l.svcCtx.AgentCommissionModel.SelectBuilder().
-		Where("agent_id = ? AND del_state = ?", agent.Id, globalkey.DelStateNo)
+		Where("agent_id = ? AND del_state = ? AND status != ?", agent.Id, globalkey.DelStateNo, 3)
 	commissionTotal, _ := l.svcCtx.AgentCommissionModel.FindSum(l.ctx, commissionBuilder, "amount")
 
-	// 3.1 统计佣金今日收益
+	// 3.1 统计佣金今日收益（排除已取消的记录 status=3）
 	commissionTodayBuilder := l.svcCtx.AgentCommissionModel.SelectBuilder().
-		Where("agent_id = ? AND del_state = ? AND create_time >= ?", agent.Id, globalkey.DelStateNo, todayStart)
+		Where("agent_id = ? AND del_state = ? AND status != ? AND create_time >= ?", agent.Id, globalkey.DelStateNo, 3, todayStart)
 	commissionToday, _ := l.svcCtx.AgentCommissionModel.FindSum(l.ctx, commissionTodayBuilder, "amount")
 
-	// 3.2 统计佣金本月收益
+	// 3.2 统计佣金本月收益（排除已取消的记录 status=3）
 	commissionMonthBuilder := l.svcCtx.AgentCommissionModel.SelectBuilder().
-		Where("agent_id = ? AND del_state = ? AND create_time >= ?", agent.Id, globalkey.DelStateNo, monthStart)
+		Where("agent_id = ? AND del_state = ? AND status != ? AND create_time >= ?", agent.Id, globalkey.DelStateNo, 3, monthStart)
 	commissionMonth, _ := l.svcCtx.AgentCommissionModel.FindSum(l.ctx, commissionMonthBuilder, "amount")
 
-	// 4. 统计返佣总额（包括推广返佣和升级返佣）
-	// 4.1 统计推广返佣（从 agent_rebate 表）
+	// 4. 统计返佣总额（包括推广返佣和升级返佣，排除已取消的记录 status=3）
+	// 4.1 统计推广返佣（从 agent_rebate 表，排除已取消的记录 status=3）
 	rebateBuilder := l.svcCtx.AgentRebateModel.SelectBuilder().
-		Where("agent_id = ? AND del_state = ?", agent.Id, globalkey.DelStateNo)
+		Where("agent_id = ? AND del_state = ? AND status != ?", agent.Id, globalkey.DelStateNo, 3)
 	promoteRebateTotal, _ := l.svcCtx.AgentRebateModel.FindSum(l.ctx, rebateBuilder, "rebate_amount")
 
 	// 4.2 统计升级返佣（从 agent_upgrade 表，查询 rebate_agent_id = 当前代理ID 且 status = 2（已完成）且 upgrade_type = 1（自主付费）的记录）
@@ -88,10 +90,10 @@ func (l *GetRevenueInfoLogic) GetRevenueInfo() (resp *types.GetRevenueInfoResp,
 
 	rebateTotal := promoteRebateTotal + upgradeRebateTotal
 
-	// 4.3 统计返佣今日收益
+	// 4.3 统计返佣今日收益（排除已取消的记录 status=3）
 	// 推广返佣今日
 	promoteRebateTodayBuilder := l.svcCtx.AgentRebateModel.SelectBuilder().
-		Where("agent_id = ? AND del_state = ? AND create_time >= ?", agent.Id, globalkey.DelStateNo, todayStart)
+		Where("agent_id = ? AND del_state = ? AND status != ? AND create_time >= ?", agent.Id, globalkey.DelStateNo, 3, todayStart)
 	promoteRebateToday, _ := l.svcCtx.AgentRebateModel.FindSum(l.ctx, promoteRebateTodayBuilder, "rebate_amount")
 	// 升级返佣今日
 	upgradeRebateTodayBuilder := l.svcCtx.AgentUpgradeModel.SelectBuilder().
@@ -100,10 +102,10 @@ func (l *GetRevenueInfoLogic) GetRevenueInfo() (resp *types.GetRevenueInfoResp,
 	upgradeRebateToday, _ := l.svcCtx.AgentUpgradeModel.FindSum(l.ctx, upgradeRebateTodayBuilder, "rebate_amount")
 	rebateToday := promoteRebateToday + upgradeRebateToday
 
-	// 4.4 统计返佣本月收益
+	// 4.4 统计返佣本月收益（排除已取消的记录 status=3）
 	// 推广返佣本月
 	promoteRebateMonthBuilder := l.svcCtx.AgentRebateModel.SelectBuilder().
-		Where("agent_id = ? AND del_state = ? AND create_time >= ?", agent.Id, globalkey.DelStateNo, monthStart)
+		Where("agent_id = ? AND del_state = ? AND status != ? AND create_time >= ?", agent.Id, globalkey.DelStateNo, 3, monthStart)
 	promoteRebateMonth, _ := l.svcCtx.AgentRebateModel.FindSum(l.ctx, promoteRebateMonthBuilder, "rebate_amount")
 	// 升级返佣本月
 	upgradeRebateMonthBuilder := l.svcCtx.AgentUpgradeModel.SelectBuilder().
@@ -112,16 +114,43 @@ func (l *GetRevenueInfoLogic) GetRevenueInfo() (resp *types.GetRevenueInfoResp,
 	upgradeRebateMonth, _ := l.svcCtx.AgentUpgradeModel.FindSum(l.ctx, upgradeRebateMonthBuilder, "rebate_amount")
 	rebateMonth := promoteRebateMonth + upgradeRebateMonth
 
+	// 5. 统计本月支付宝提现额度使用情况
+	// 5.1 获取配置的支付宝月度额度（默认 800 元）
+	alipayQuota := 800.0
+	if cfg, cfgErr := l.svcCtx.AgentConfigModel.FindOneByConfigKey(l.ctx, "alipay_month_quota"); cfgErr == nil {
+		if parsed, parseErr := parseFloatConfig(cfg.ConfigValue); parseErr == nil && parsed > 0 {
+			alipayQuota = parsed
+		}
+	}
+
+	// 5.2 统计本月已申请/成功的支付宝提现金额（status IN (1,5)），用于前端展示额度占用
+	withdrawBuilder := l.svcCtx.AgentWithdrawalModel.SelectBuilder().
+		Where("agent_id = ? AND withdrawal_type = ? AND status IN (1,5) AND create_time >= ? AND create_time < ?",
+			agent.Id, 1, monthStart, nextMonthStart)
+	alipayUsed, _ := l.svcCtx.AgentWithdrawalModel.FindSum(l.ctx, withdrawBuilder, "amount")
+	if alipayUsed < 0 {
+		alipayUsed = 0
+	}
+
 	return &types.GetRevenueInfoResp{
-		Balance:         wallet.Balance,
-		FrozenBalance:   wallet.FrozenBalance,
-		TotalEarnings:   wallet.TotalEarnings,
-		WithdrawnAmount: wallet.WithdrawnAmount,
-		CommissionTotal: commissionTotal, // 佣金累计总收益（推广订单获得的佣金）
-		CommissionToday: commissionToday, // 佣金今日收益
-		CommissionMonth: commissionMonth, // 佣金本月收益
-		RebateTotal:     rebateTotal,     // 返佣累计总收益（包括推广返佣和升级返佣）
-		RebateToday:     rebateToday,     // 返佣今日收益
-		RebateMonth:     rebateMonth,     // 返佣本月收益
+		Balance:          wallet.Balance,
+		FrozenBalance:    wallet.FrozenBalance,
+		TotalEarnings:    wallet.TotalEarnings,
+		WithdrawnAmount:  wallet.WithdrawnAmount,
+		CommissionTotal:  commissionTotal, // 佣金累计总收益（推广订单获得的佣金）
+		CommissionToday:  commissionToday, // 佣金今日收益
+		CommissionMonth:  commissionMonth, // 佣金本月收益
+		RebateTotal:      rebateTotal,     // 返佣累计总收益（包括推广返佣和升级返佣）
+		RebateToday:      rebateToday,     // 返佣今日收益
+		RebateMonth:      rebateMonth,     // 返佣本月收益
+		AlipayMonthQuota: alipayQuota,     // 支付宝每月提现总额度
+		AlipayMonthUsed:  alipayUsed,      // 本月已使用的支付宝提现额度
 	}, nil
 }
+
+// parseFloatConfig 解析配置中的浮点数
+func parseFloatConfig(s string) (float64, error) {
+	var result float64
+	_, err := fmt.Sscanf(s, "%f", &result)
+	return result, err
+}

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

@@ -88,10 +88,10 @@ func (l *GetSubordinateContributionDetailLogic) GetSubordinateContributionDetail
 	todayStart := time.Date(now.Year(), now.Month(), now.Day(), 0, 0, 0, 0, now.Location())
 	monthStart := time.Date(now.Year(), now.Month(), 1, 0, 0, 0, 0, now.Location())
 
-	// 7. 统计订单数据（仅统计有返佣给当前用户的订单）
+	// 7. 统计订单数据（仅统计有返佣给当前用户的订单，排除已取消的记录 status=3）
 	// 通过 agent_rebate 表统计 DISTINCT order_id
 	rebateBaseBuilder := l.svcCtx.AgentRebateModel.SelectBuilder().
-		Where("agent_id = ? AND source_agent_id = ? AND del_state = ?", agent.Id, req.SubordinateId, globalkey.DelStateNo)
+		Where("agent_id = ? AND source_agent_id = ? AND del_state = ? AND status != ?", agent.Id, req.SubordinateId, globalkey.DelStateNo, 3)
 
 	// 总订单量（去重订单ID）
 	totalOrders := l.countDistinctOrders(l.ctx, rebateBaseBuilder)
@@ -104,7 +104,7 @@ func (l *GetSubordinateContributionDetailLogic) GetSubordinateContributionDetail
 	monthRebateBuilder := rebateBaseBuilder.Where("create_time >= ?", monthStart)
 	monthOrders := l.countDistinctOrders(l.ctx, monthRebateBuilder)
 
-	// 8. 统计返佣金额
+	// 8. 统计返佣金额（排除已取消的记录 status=3）
 	totalRebateAmount, _ := l.svcCtx.AgentRebateModel.FindSum(l.ctx, rebateBaseBuilder, "rebate_amount")
 	todayRebateAmount, _ := l.svcCtx.AgentRebateModel.FindSum(l.ctx, todayRebateBuilder, "rebate_amount")
 	monthRebateAmount, _ := l.svcCtx.AgentRebateModel.FindSum(l.ctx, monthRebateBuilder, "rebate_amount")
@@ -227,12 +227,12 @@ func (l *GetSubordinateContributionDetailLogic) countDistinctOrders(ctx context.
 func (l *GetSubordinateContributionDetailLogic) getOrderList(ctx context.Context, agentId, subordinateId string, page, pageSize int64) ([]types.OrderItem, int64, error) {
 	// 1. 查询所有返佣记录
 	rebateBuilder := l.svcCtx.AgentRebateModel.SelectBuilder().
-		Where("agent_id = ? AND source_agent_id = ? AND del_state = ?", agentId, subordinateId, globalkey.DelStateNo).
+		Where("agent_id = ? AND source_agent_id = ? AND del_state = ? AND status != ?", agentId, subordinateId, globalkey.DelStateNo, 3).
 		OrderBy("create_time DESC")
 
 	// 查询总数（去重订单ID）
 	totalBuilder := l.svcCtx.AgentRebateModel.SelectBuilder().
-		Where("agent_id = ? AND source_agent_id = ? AND del_state = ?", agentId, subordinateId, globalkey.DelStateNo)
+		Where("agent_id = ? AND source_agent_id = ? AND del_state = ? AND status != ?", agentId, subordinateId, globalkey.DelStateNo, 3)
 	total := l.countDistinctOrders(ctx, totalBuilder)
 
 	// 查询所有返佣记录

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

@@ -109,8 +109,7 @@ func (l *GetTeamListLogic) GetTeamList(req *types.GetTeamListReq) (resp *types.G
 
 	// 7. 查询所有下级代理信息（不进行手机号过滤，因为需要模糊搜索）
 	builder := l.svcCtx.AgentModel.SelectBuilder().
-		Where(squirrel.Eq{"id": subordinateIds}).
-		Where("del_state = ?", globalkey.DelStateNo)
+		Where(squirrel.Eq{"id": subordinateIds})
 
 	allTeamMembers, err := l.svcCtx.AgentModel.FindAll(l.ctx, builder, "")
 	if err != nil {
@@ -207,10 +206,10 @@ func (l *GetTeamListLogic) calculateTeamStatistics(agentId string, subordinateId
 	stats.TodayNewMembers = todayNewCount
 	stats.MonthNewMembers = monthNewCount
 
-	// 统计团队总查询量（仅统计有返佣给当前用户的订单，通过agent_rebate表去重统计order_id）
+	// 统计团队总查询量（仅统计有返佣给当前用户的订单，通过agent_rebate表去重统计order_id，排除已取消的记录 status=3）
 	if len(subordinateIds) > 0 {
 		rebateBuilder := l.svcCtx.AgentRebateModel.SelectBuilder().
-			Where("agent_id = ? AND del_state = ?", agentId, globalkey.DelStateNo).
+			Where("agent_id = ? AND del_state = ? AND status != ?", agentId, globalkey.DelStateNo, 3).
 			Where("source_agent_id != ?", agentId). // 明确排除自己
 			Where(squirrel.Eq{"source_agent_id": subordinateIds})
 
@@ -229,14 +228,15 @@ func (l *GetTeamListLogic) calculateTeamStatistics(agentId string, subordinateId
 		stats.MonthPromotions = monthPromotions
 	}
 
-	// 统计收益：只统计从下级获得的返佣（依靠团队得到的收益）
+	// 统计收益：只统计从下级获得的返佣（依靠团队得到的收益，排除已取消的记录 status=3）
 	// 返佣：从agent_rebate表统计（从下级获得的返佣）
 	// agent_id = 当前代理ID（获得返佣的代理）
 	// source_agent_id IN 下级ID列表（来源代理，即产生订单的下级代理）
 	// 明确排除自己：source_agent_id != agentId（确保不统计自己的数据）
+	// 排除已取消：status != 3（确保不统计已撤销的返佣）
 	if len(subordinateIds) > 0 {
 		rebateBuilder := l.svcCtx.AgentRebateModel.SelectBuilder().
-			Where("agent_id = ? AND del_state = ?", agentId, globalkey.DelStateNo).
+			Where("agent_id = ? AND del_state = ? AND status != ?", agentId, globalkey.DelStateNo, 3).
 			Where("source_agent_id != ?", agentId). // 明确排除自己
 			Where(squirrel.Eq{"source_agent_id": subordinateIds})
 		totalRebate, _ := l.svcCtx.AgentRebateModel.FindSum(l.ctx, rebateBuilder, "rebate_amount")
@@ -304,16 +304,16 @@ func (l *GetTeamListLogic) buildTeamMemberItem(agentId string, member *model.Age
 		}
 	}
 
-	// 统计查询量（仅统计有返佣给当前用户的订单，通过agent_rebate表去重统计order_id）
+	// 统计查询量（仅统计有返佣给当前用户的订单，通过agent_rebate表去重统计order_id，排除已取消的记录 status=3）
 	rebateBuilder := l.svcCtx.AgentRebateModel.SelectBuilder().
-		Where("agent_id = ? AND source_agent_id = ? AND del_state = ?", agentId, member.Id, globalkey.DelStateNo)
+		Where("agent_id = ? AND source_agent_id = ? AND del_state = ? AND status != ?", agentId, member.Id, globalkey.DelStateNo, 3)
 	totalQueries := l.countDistinctOrdersForMember(l.ctx, rebateBuilder)
 	todayRebateBuilder := rebateBuilder.Where("create_time >= ?", todayStart)
 	todayQueries := l.countDistinctOrdersForMember(l.ctx, todayRebateBuilder)
 	monthRebateBuilder := rebateBuilder.Where("create_time >= ?", monthStart)
 	monthQueries := l.countDistinctOrdersForMember(l.ctx, monthRebateBuilder)
 
-	// 统计返佣给我的金额（从agent_rebate表，source_agent_id = member.Id, agent_id = agentId）
+	// 统计返佣给我的金额（从agent_rebate表，source_agent_id = member.Id, agent_id = agentId，排除已取消的记录 status=3）
 	totalRebateAmount, _ := l.svcCtx.AgentRebateModel.FindSum(l.ctx, rebateBuilder, "rebate_amount")
 	todayRebateAmount, _ := l.svcCtx.AgentRebateModel.FindSum(l.ctx, rebateBuilder.Where("create_time >= ?", todayStart), "rebate_amount")
 

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

@@ -47,12 +47,12 @@ func (l *GetTeamStatisticsLogic) GetTeamStatistics() (resp *types.TeamStatistics
 	}
 
 	// 2. 递归查询所有下级（直接+间接）
-    allSubordinateIds := make(map[string]bool)
-    directSubordinateIds := make(map[string]bool)
+	allSubordinateIds := make(map[string]bool)
+	directSubordinateIds := make(map[string]bool)
 
 	// 递归函数：收集所有下级ID
-    var collectSubordinates func(string) error
-    collectSubordinates = func(parentId string) error {
+	var collectSubordinates func(string) error
+	collectSubordinates = func(parentId string) error {
 		// 查询直接下级
 		builder := l.svcCtx.AgentRelationModel.SelectBuilder().
 			Where("parent_id = ? AND relation_type = ? AND del_state = ?", parentId, 1, globalkey.DelStateNo)
@@ -63,23 +63,23 @@ func (l *GetTeamStatisticsLogic) GetTeamStatistics() (resp *types.TeamStatistics
 
 		for _, relation := range relations {
 			// 如果是第一层，标记为直接下级
-            if parentId == agent.Id {
-                directSubordinateIds[relation.ChildId] = true
-            }
-            // 添加到所有下级集合
-            allSubordinateIds[relation.ChildId] = true
-            // 递归查询下级的下级
-            if err := collectSubordinates(relation.ChildId); err != nil {
-                return err
-            }
-        }
-        return nil
-    }
+			if parentId == agent.Id {
+				directSubordinateIds[relation.ChildId] = true
+			}
+			// 添加到所有下级集合
+			allSubordinateIds[relation.ChildId] = true
+			// 递归查询下级的下级
+			if err := collectSubordinates(relation.ChildId); err != nil {
+				return err
+			}
+		}
+		return nil
+	}
 
 	// 开始递归收集所有下级
-    if err := collectSubordinates(agent.Id); err != nil {
-        return nil, errors.Wrapf(xerr.NewErrCode(xerr.DB_ERROR), "查询下级关系失败, %v", err)
-    }
+	if err := collectSubordinates(agent.Id); err != nil {
+		return nil, errors.Wrapf(xerr.NewErrCode(xerr.DB_ERROR), "查询下级关系失败, %v", err)
+	}
 
 	// 3. 获取当前时间用于统计今日和本月新增
 	now := time.Now()
@@ -100,15 +100,14 @@ func (l *GetTeamStatisticsLogic) GetTeamStatistics() (resp *types.TeamStatistics
 	}
 
 	// 5. 将下级ID转换为切片用于查询
-    subordinateIds := make([]string, 0, len(allSubordinateIds))
-    for id := range allSubordinateIds {
-        subordinateIds = append(subordinateIds, id)
-    }
+	subordinateIds := make([]string, 0, len(allSubordinateIds))
+	for id := range allSubordinateIds {
+		subordinateIds = append(subordinateIds, id)
+	}
 
 	// 6. 查询所有下级代理信息
 	builder := l.svcCtx.AgentModel.SelectBuilder().
-		Where(squirrel.Eq{"id": subordinateIds}).
-		Where("del_state = ?", globalkey.DelStateNo)
+		Where(squirrel.Eq{"id": subordinateIds})
 
 	teamMembers, err := l.svcCtx.AgentModel.FindAll(l.ctx, builder, "")
 	if err != nil {

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

@@ -0,0 +1,57 @@
+package agent
+
+import (
+	"context"
+	"ycc-server/common/xerr"
+
+	"github.com/pkg/errors"
+
+	"ycc-server/app/main/api/internal/svc"
+	"ycc-server/app/main/api/internal/types"
+
+	"github.com/zeromicro/go-zero/core/logx"
+)
+
+type GetWhitelistFeaturesLogic struct {
+	logx.Logger
+	ctx    context.Context
+	svcCtx *svc.ServiceContext
+}
+
+func NewGetWhitelistFeaturesLogic(ctx context.Context, svcCtx *svc.ServiceContext) *GetWhitelistFeaturesLogic {
+	return &GetWhitelistFeaturesLogic{
+		Logger: logx.WithContext(ctx),
+		ctx:    ctx,
+		svcCtx: svcCtx,
+	}
+}
+
+func (l *GetWhitelistFeaturesLogic) GetWhitelistFeatures(req *types.GetWhitelistFeaturesReq) (resp *types.GetWhitelistFeaturesResp, err error) {
+	// 使用SelectBuilder查询所有feature，然后筛选whitelist_price > 0的
+	// 注意：系统会自动处理del_state，不需要手动添加
+	builder := l.svcCtx.FeatureModel.SelectBuilder().
+		Where("whitelist_price > 0").
+		OrderBy("name ASC")
+
+	features, err := l.svcCtx.FeatureModel.FindAll(l.ctx, builder, "")
+	if err != nil {
+		return nil, errors.Wrapf(xerr.NewErrCode(xerr.DB_ERROR), "查询feature列表失败, %v", err)
+	}
+
+	// 组装响应，直接使用feature的WhitelistPrice字段
+	list := make([]types.WhitelistFeatureItem, 0, len(features))
+	for _, f := range features {
+		if f.WhitelistPrice > 0 {
+			list = append(list, types.WhitelistFeatureItem{
+				FeatureId:      f.Id,
+				FeatureApiId:   f.ApiId,
+				FeatureName:    f.Name,
+				WhitelistPrice: f.WhitelistPrice,
+			})
+		}
+	}
+
+	return &types.GetWhitelistFeaturesResp{
+		List: list,
+	}, nil
+}

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

@@ -0,0 +1,117 @@
+package agent
+
+import (
+	"context"
+	"ycc-server/app/main/model"
+	"ycc-server/common/ctxdata"
+	"ycc-server/common/xerr"
+
+	"github.com/pkg/errors"
+
+	"ycc-server/app/main/api/internal/svc"
+	"ycc-server/app/main/api/internal/types"
+
+	"github.com/zeromicro/go-zero/core/logx"
+)
+
+type GetWhitelistListLogic struct {
+	logx.Logger
+	ctx    context.Context
+	svcCtx *svc.ServiceContext
+}
+
+func NewGetWhitelistListLogic(ctx context.Context, svcCtx *svc.ServiceContext) *GetWhitelistListLogic {
+	return &GetWhitelistListLogic{
+		Logger: logx.WithContext(ctx),
+		ctx:    ctx,
+		svcCtx: svcCtx,
+	}
+}
+
+func (l *GetWhitelistListLogic) GetWhitelistList(req *types.GetWhitelistListReq) (resp *types.GetWhitelistListResp, err error) {
+	userID, err := ctxdata.GetUidFromCtx(l.ctx)
+	if err != nil {
+		return nil, errors.Wrapf(xerr.NewErrCode(xerr.SERVER_COMMON_ERROR), "获取用户信息失败, %v", err)
+	}
+
+	// 1. 验证是否为代理（查询白名单列表需要是代理）
+	_, err = l.svcCtx.AgentModel.FindOneByUserId(l.ctx, userID)
+	if err != nil {
+		if errors.Is(err, model.ErrNotFound) {
+			return nil, errors.Wrapf(xerr.NewErrMsg("您不是代理"), "")
+		}
+		return nil, errors.Wrapf(xerr.NewErrCode(xerr.DB_ERROR), "查询代理信息失败, %v", err)
+	}
+
+	// 2. 构建查询条件
+	// 注意：系统会自动处理del_state，不需要手动添加
+	builder := l.svcCtx.UserFeatureWhitelistModel.SelectBuilder().
+		Where("user_id = ?", userID)
+
+	// 如果指定了身份证号，添加筛选条件
+	if req.IdCard != "" {
+		builder = builder.Where("id_card = ?", req.IdCard)
+	}
+
+	// 3. 分页查询
+	total, err := l.svcCtx.UserFeatureWhitelistModel.FindCount(l.ctx, builder, "id")
+	if err != nil {
+		return nil, errors.Wrapf(xerr.NewErrCode(xerr.DB_ERROR), "查询总数失败, %v", err)
+	}
+
+	whitelists, err := l.svcCtx.UserFeatureWhitelistModel.FindPageListByPage(l.ctx, builder, req.Page, req.PageSize, "create_time DESC")
+	if err != nil {
+		return nil, errors.Wrapf(xerr.NewErrCode(xerr.DB_ERROR), "查询白名单列表失败, %v", err)
+	}
+
+	// 4. 组装响应
+	list := make([]types.WhitelistItem, 0, len(whitelists))
+	for _, w := range whitelists {
+		statusText := "生效"
+		if w.Status == 2 {
+			statusText = "已失效"
+		}
+
+		list = append(list, types.WhitelistItem{
+			Id:           w.Id,
+			IdCard:      w.IdCard,
+			FeatureId:    w.FeatureId,
+			FeatureApiId: w.FeatureApiId,
+			FeatureName:  "", // 需要从feature表查询，或者冗余存储
+			Amount:        w.Amount,
+			Status:        w.Status,
+			StatusText:    statusText,
+			CreateTime:    w.CreateTime.Format("2006-01-02 15:04:05"),
+		})
+	}
+
+	// 5. 查询feature名称（批量查询优化）
+	if len(list) > 0 {
+		featureIds := make([]string, 0, len(list))
+		featureMap := make(map[string]string) // feature_id -> feature_name
+		for _, item := range list {
+			featureIds = append(featureIds, item.FeatureId)
+		}
+
+		// 批量查询feature
+		for _, featureId := range featureIds {
+			feature, err := l.svcCtx.FeatureModel.FindOne(l.ctx, featureId)
+			if err == nil {
+				featureMap[featureId] = feature.Name
+			}
+		}
+
+		// 填充feature名称
+		for i := range list {
+			if name, ok := featureMap[list[i].FeatureId]; ok {
+				list[i].FeatureName = name
+			}
+		}
+	}
+
+	return &types.GetWhitelistListResp{
+		Total: total,
+		List:  list,
+	}, nil
+}
+

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

@@ -81,18 +81,31 @@ func (l *GetWithdrawalListLogic) GetWithdrawalList(req *types.GetWithdrawalListR
 			remark = withdrawal.Remark.String
 		}
 
-		list = append(list, types.WithdrawalItem{
-			Id:           withdrawal.Id,
-			WithdrawalNo: withdrawal.WithdrawNo,
-			Amount:       withdrawal.Amount,
-			TaxAmount:    withdrawal.TaxAmount,
-			ActualAmount: withdrawal.ActualAmount,
-			Status:       withdrawal.Status,
-			PayeeAccount: withdrawal.PayeeAccount,
-			PayeeName:    withdrawal.PayeeName,
-			Remark:       remark,
-			CreateTime:   withdrawal.CreateTime.Format("2006-01-02 15:04:05"),
-		})
+		item := types.WithdrawalItem{
+			Id:             withdrawal.Id,
+			WithdrawalNo:   withdrawal.WithdrawNo,
+			WithdrawalType: withdrawal.WithdrawalType,
+			Amount:         withdrawal.Amount,
+			TaxAmount:      withdrawal.TaxAmount,
+			ActualAmount:   withdrawal.ActualAmount,
+			Status:         withdrawal.Status,
+			PayeeAccount:   withdrawal.PayeeAccount,
+			PayeeName:      withdrawal.PayeeName,
+			Remark:         remark,
+			CreateTime:     withdrawal.CreateTime.Format("2006-01-02 15:04:05"),
+		}
+
+		// 如果是银行卡提现，填充银行卡信息
+		if withdrawal.WithdrawalType == 2 {
+			if withdrawal.BankCardNo.Valid {
+				item.BankCardNo = withdrawal.BankCardNo.String
+			}
+			if withdrawal.BankName.Valid {
+				item.BankName = withdrawal.BankName.String
+			}
+		}
+
+		list = append(list, item)
 	}
 
 	return &types.GetWithdrawalListResp{

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

@@ -0,0 +1,174 @@
+package agent
+
+import (
+	"context"
+	"encoding/hex"
+	"encoding/json"
+	"ycc-server/app/main/model"
+	"ycc-server/common/ctxdata"
+	"ycc-server/common/xerr"
+	"ycc-server/pkg/lzkit/crypto"
+
+	"github.com/pkg/errors"
+
+	"ycc-server/app/main/api/internal/svc"
+	"ycc-server/app/main/api/internal/types"
+
+	"github.com/zeromicro/go-zero/core/logx"
+	"github.com/zeromicro/go-zero/core/stores/sqlx"
+)
+
+type OfflineFeatureLogic struct {
+	logx.Logger
+	ctx    context.Context
+	svcCtx *svc.ServiceContext
+}
+
+func NewOfflineFeatureLogic(ctx context.Context, svcCtx *svc.ServiceContext) *OfflineFeatureLogic {
+	return &OfflineFeatureLogic{
+		Logger: logx.WithContext(ctx),
+		ctx:    ctx,
+		svcCtx: svcCtx,
+	}
+}
+
+func (l *OfflineFeatureLogic) OfflineFeature(req *types.OfflineFeatureReq) (resp *types.OfflineFeatureResp, err error) {
+	// 1. 验证参数
+	if err := l.validateRequest(req); err != nil {
+		return nil, err
+	}
+
+	// 2. 获取用户ID并验证代理权限
+	userID, err := l.verifyDiamondAgent()
+	if err != nil {
+		return nil, err
+	}
+
+	// 3. 获取查询记录和身份证号
+	queryModel, idCard, err := l.getQueryInfo(req.QueryId)
+	if err != nil {
+		return nil, err
+	}
+	_ = queryModel // 避免未使用变量警告
+
+	// 4. 调用 WhitelistService 统一下架处理
+	needPay, amount, whitelistCreated, err := l.svcCtx.WhitelistService.ProcessOfflineFeature(
+		l.ctx,
+		nil, // 不使用事务，因为可能只是检查
+		idCard,
+		req.FeatureApiId,
+		userID,
+		req.QueryId,
+	)
+	if err != nil {
+		return nil, err
+	}
+
+	// 5. 如果已创建白名单，需要删除报告数据
+	if whitelistCreated {
+		if err := l.deleteQueryData(req.QueryId, req.FeatureApiId); err != nil {
+			// 删除报告数据失败不影响主流程，只记录日志
+			logx.Errorf("下架模块后删除报告数据失败：查询记录 %s，模块 %s，错误：%v", req.QueryId, req.FeatureApiId, err)
+		}
+	}
+
+	return &types.OfflineFeatureResp{
+		Success: whitelistCreated,
+		NeedPay: needPay,
+		Amount:  amount,
+	}, nil
+}
+
+// validateRequest 验证请求参数
+func (l *OfflineFeatureLogic) validateRequest(req *types.OfflineFeatureReq) error {
+	if req.QueryId == "" {
+		return errors.Wrapf(xerr.NewErrMsg("查询记录ID不能为空"), "")
+	}
+	if req.FeatureApiId == "" {
+		return errors.Wrapf(xerr.NewErrMsg("模块API标识不能为空"), "")
+	}
+	return nil
+}
+
+// verifyDiamondAgent 验证是否为钻石代理并返回用户ID
+func (l *OfflineFeatureLogic) verifyDiamondAgent() (string, error) {
+	userID, err := ctxdata.GetUidFromCtx(l.ctx)
+	if err != nil {
+		return "", errors.Wrapf(xerr.NewErrCode(xerr.SERVER_COMMON_ERROR), "获取用户信息失败, %v", err)
+	}
+
+	agent, err := l.svcCtx.AgentModel.FindOneByUserId(l.ctx, userID)
+	if err != nil {
+		if errors.Is(err, model.ErrNotFound) {
+			return "", errors.Wrapf(xerr.NewErrMsg("您不是代理"), "")
+		}
+		return "", errors.Wrapf(xerr.NewErrCode(xerr.DB_ERROR), "查询代理信息失败, %v", err)
+	}
+
+	if agent.Level != 3 {
+		return "", errors.Wrapf(xerr.NewErrMsg("只有钻石代理可以操作白名单下架"), "")
+	}
+
+	return userID, nil
+}
+
+// getQueryInfo 获取查询记录和身份证号
+func (l *OfflineFeatureLogic) getQueryInfo(queryId string) (*model.Query, string, error) {
+	queryModel, err := l.svcCtx.QueryModel.FindOne(l.ctx, queryId)
+	if err != nil {
+		if errors.Is(err, model.ErrNotFound) {
+			return nil, "", errors.Wrapf(xerr.NewErrMsg("查询记录不存在"), "")
+		}
+		return nil, "", errors.Wrapf(xerr.NewErrCode(xerr.DB_ERROR), "查询报告记录失败, %v", err)
+	}
+
+	// 解密 QueryParams 获取 idCard
+	idCard, err := l.extractIdCardFromQueryParams(queryModel)
+	if err != nil {
+		return nil, "", errors.Wrapf(xerr.NewErrCode(xerr.SERVER_COMMON_ERROR), "获取身份证号失败, %v", err)
+	}
+
+	if idCard == "" {
+		return nil, "", errors.Wrapf(xerr.NewErrMsg("查询参数中缺少身份证号"), "")
+	}
+
+	return queryModel, idCard, nil
+}
+
+// extractIdCardFromQueryParams 从 QueryParams 中提取身份证号
+func (l *OfflineFeatureLogic) extractIdCardFromQueryParams(queryModel *model.Query) (string, error) {
+	if queryModel.QueryParams == "" {
+		return "", errors.New("查询参数为空")
+	}
+
+	secretKey := l.svcCtx.Config.Encrypt.SecretKey
+	key, decodeErr := hex.DecodeString(secretKey)
+	if decodeErr != nil {
+		return "", errors.Wrap(decodeErr, "获取AES密钥失败")
+	}
+
+	decryptedParams, decryptErr := crypto.AesDecrypt(queryModel.QueryParams, key)
+	if decryptErr != nil {
+		return "", errors.Wrap(decryptErr, "解密查询参数失败")
+	}
+
+	var params map[string]interface{}
+	unmarshalErr := json.Unmarshal(decryptedParams, &params)
+	if unmarshalErr != nil {
+		return "", errors.Wrap(unmarshalErr, "解析查询参数失败")
+	}
+
+	idCard, ok := params["id_card"].(string)
+	if !ok || idCard == "" {
+		return "", errors.New("查询参数中缺少 id_card 或 id_card 为空")
+	}
+
+	return idCard, nil
+}
+
+// deleteQueryData 删除报告数据
+func (l *OfflineFeatureLogic) deleteQueryData(queryId, featureApiId string) error {
+	return l.svcCtx.QueryModel.Trans(l.ctx, func(ctx context.Context, session sqlx.Session) error {
+		return l.svcCtx.WhitelistService.DeleteFeatureFromQueryData(ctx, session, queryId, featureApiId)
+	})
+}

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

@@ -5,6 +5,7 @@ import (
 	"database/sql"
 	"encoding/hex"
 	"fmt"
+	"os"
 	"ycc-server/app/main/model"
 	"ycc-server/common/ctxdata"
 	"ycc-server/common/xerr"
@@ -61,39 +62,42 @@ func (l *RealNameAuthLogic) RealNameAuth(req *types.RealNameAuthReq) (resp *type
 		return nil, errors.Wrapf(xerr.NewErrMsg("手机号与代理注册手机号不匹配"), "")
 	}
 
-	// 3. 验证验证码
-	encryptedMobile, err := crypto.EncryptMobile(req.Mobile, l.svcCtx.Config.Encrypt.SecretKey)
-	if err != nil {
-		return nil, errors.Wrapf(xerr.NewErrCode(xerr.SERVER_COMMON_ERROR), "加密手机号失败, %v", err)
-	}
-	redisKey := fmt.Sprintf("realName:%s", encryptedMobile)
-	cacheCode, err := l.svcCtx.Redis.Get(redisKey)
-	if err != nil {
-		if errors.Is(err, redis.Nil) {
-			return nil, errors.Wrapf(xerr.NewErrMsg("验证码已过期"), "")
+	// 开发环境下跳过验证码校验
+	if os.Getenv("ENV") != "development" {
+		encryptedMobile, err := crypto.EncryptMobile(req.Mobile, l.svcCtx.Config.Encrypt.SecretKey)
+		if err != nil {
+			return nil, errors.Wrapf(xerr.NewErrCode(xerr.SERVER_COMMON_ERROR), "加密手机号失败, %v", err)
+		}
+		redisKey := fmt.Sprintf("realName:%s", encryptedMobile)
+		cacheCode, err := l.svcCtx.Redis.Get(redisKey)
+		if err != nil {
+			if errors.Is(err, redis.Nil) {
+				return nil, errors.Wrapf(xerr.NewErrMsg("验证码已过期"), "")
+			}
+			return nil, errors.Wrapf(xerr.NewErrCode(xerr.DB_ERROR), "读取验证码失败, %v", err)
+		}
+		if cacheCode != req.Code {
+			return nil, errors.Wrapf(xerr.NewErrMsg("验证码不正确"), "")
 		}
-		return nil, errors.Wrapf(xerr.NewErrCode(xerr.DB_ERROR), "读取验证码失败, %v", err)
-	}
-	if cacheCode != req.Code {
-		return nil, errors.Wrapf(xerr.NewErrMsg("验证码不正确"), "")
 	}
 
-	// 4. 三要素核验（姓名、身份证号、手机号）
-	verification, err := l.svcCtx.VerificationService.ThreeFactorVerification(service.ThreeFactorVerificationRequest{
-		Name:   req.Name,
-		IDCard: req.IdCard,
-		Mobile: req.Mobile,
-	})
-	if err != nil {
-		return nil, errors.Wrapf(xerr.NewErrCode(xerr.SERVER_COMMON_ERROR), "三要素核验失败: %v", err)
-	}
-	if !verification.Passed {
-		if verification.Err != nil {
-			return nil, errors.Wrapf(xerr.NewErrMsg(verification.Err.Error()), "三要素核验不通过")
+	if os.Getenv("ENV") != "development" {
+		// 4. 三要素核验（姓名、身份证号、手机号）
+		verification, err := l.svcCtx.VerificationService.ThreeFactorVerification(service.ThreeFactorVerificationRequest{
+			Name:   req.Name,
+			IDCard: req.IdCard,
+			Mobile: req.Mobile,
+		})
+		if err != nil {
+			return nil, errors.Wrapf(xerr.NewErrCode(xerr.SERVER_COMMON_ERROR), "三要素核验失败: %v", err)
+		}
+		if !verification.Passed {
+			if verification.Err != nil {
+				return nil, errors.Wrapf(xerr.NewErrMsg(verification.Err.Error()), "三要素核验不通过")
+			}
+			return nil, errors.Wrapf(xerr.NewErrMsg("三要素核验不通过"), "")
 		}
-		return nil, errors.Wrapf(xerr.NewErrMsg("三要素核验不通过"), "")
 	}
-
 	// 5. 检查是否已有实名认证记录
 	existingRealName, err := l.svcCtx.AgentRealNameModel.FindOneByAgentId(l.ctx, agent.Id)
 	if err != nil && !errors.Is(err, model.ErrNotFound) {