fix

app/main/api/internal/logic/admin_agent/adminauditwithdrawallogic.go

@@ -4,8 +4,8 @@ import (
 	"context"
 	"database/sql"
 	"fmt"
+	"os"
 	"time"
-	"ycc-server/common/globalkey"
 	"ycc-server/common/xerr"
 	"ycc-server/pkg/lzkit/lzUtils"
 
@@ -32,6 +32,13 @@ func NewAdminAuditWithdrawalLogic(ctx context.Context, svcCtx *svc.ServiceContex
 	}
 }
 
+// parseFloat 解析配置中的浮点数
+func (l *AdminAuditWithdrawalLogic) parseFloat(s string) (float64, error) {
+	var result float64
+	_, err := fmt.Sscanf(s, "%f", &result)
+	return result, err
+}
+
 func (l *AdminAuditWithdrawalLogic) AdminAuditWithdrawal(req *types.AdminAuditWithdrawalReq) (resp *types.AdminAuditWithdrawalResp, err error) {
 	// 1. 查询提现记录
 	withdrawal, err := l.svcCtx.AgentWithdrawalModel.FindOne(l.ctx, req.WithdrawalId)
@@ -47,38 +54,122 @@ func (l *AdminAuditWithdrawalLogic) AdminAuditWithdrawal(req *types.AdminAuditWi
 	// 4. 使用事务处理审核
 	err = l.svcCtx.AgentWithdrawalModel.Trans(l.ctx, func(transCtx context.Context, session sqlx.Session) error {
 		if req.Status == 2 { // 审核通过
-			// 4.1 更新提现记录状态为提现中
-			withdrawal.Status = 4 // 提现中
-			withdrawal.Remark = sql.NullString{String: req.Remark, Valid: true}
-			if err := l.svcCtx.AgentWithdrawalModel.UpdateWithVersion(transCtx, session, withdrawal); err != nil {
-				return errors.Wrapf(err, "更新提现记录失败")
-			}
+			// 4.1 根据提现方式处理
+			if withdrawal.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)
 
-			// 4.2 调用支付宝转账接口
-			outBizNo := withdrawal.WithdrawNo
-			transferResp, err := l.svcCtx.AlipayService.AliTransfer(transCtx, withdrawal.PayeeAccount, withdrawal.PayeeName, withdrawal.ActualAmount, "代理提现", outBizNo)
-			if err != nil {
-				// 转账失败，更新状态为失败
-				withdrawal.Status = 6 // 提现失败
-				withdrawal.Remark = sql.NullString{String: fmt.Sprintf("转账失败: %v", err), Valid: true}
-				l.svcCtx.AgentWithdrawalModel.UpdateWithVersion(transCtx, session, withdrawal)
-
-				// 解冻余额
-				wallet, err := l.svcCtx.AgentWalletModel.FindOneByAgentId(transCtx, withdrawal.AgentId)
-				if err == nil {
-					wallet.FrozenBalance -= withdrawal.Amount
-					wallet.Balance += withdrawal.Amount
-					l.svcCtx.AgentWalletModel.UpdateWithVersion(transCtx, session, wallet)
+				// 获取支付宝月度额度配置（默认 800 元）
+				alipayQuota := 800.0
+				if cfg, cfgErr := l.svcCtx.AgentConfigModel.FindOneByConfigKey(transCtx, "alipay_month_quota"); cfgErr == nil {
+					if parsed, parseErr := l.parseFloat(cfg.ConfigValue); parseErr == nil && parsed > 0 {
+						alipayQuota = parsed
+					}
 				}
 
-				return errors.Wrapf(err, "支付宝转账失败")
-			}
+				// 统计本月已成功的支付宝提现金额（status=5）
+				withdrawBuilder := l.svcCtx.AgentWithdrawalModel.SelectBuilder().
+					Where("agent_id = ? AND withdrawal_type = ? AND status = ? AND create_time >= ? AND create_time < ?",
+						withdrawal.AgentId, 1, 5, monthStart, nextMonthStart)
+				usedAmount, sumErr := l.svcCtx.AgentWithdrawalModel.FindSum(transCtx, withdrawBuilder, "amount")
+				if sumErr != nil {
+					return errors.Wrapf(sumErr, "查询本月支付宝提现额度使用情况失败")
+				}
 
-			// 4.3 根据转账结果更新状态
-			switch transferResp.Status {
-			case "SUCCESS":
-				// 转账成功
+				if usedAmount+withdrawal.Amount > alipayQuota {
+					// 超出额度，不允许通过，保持待审核状态并提示原因
+					withdrawal.Status = 1
+					withdrawal.Remark = sql.NullString{
+						String: fmt.Sprintf("超过本月支付宝提现额度（限额：%.2f 元，已用：%.2f 元），请使用银行卡提现或调整金额", alipayQuota, usedAmount),
+						Valid:  true,
+					}
+					if err := l.svcCtx.AgentWithdrawalModel.UpdateWithVersion(transCtx, session, withdrawal); err != nil {
+						return errors.Wrapf(err, "更新提现记录失败")
+					}
+					return errors.Wrapf(xerr.NewErrMsg("超过本月支付宝提现额度，无法通过该笔提现"), "")
+				}
+
+				// 支付宝提现：开发环境下做模拟，不调用真实支付宝转账
+				mockTransferStatus := "SUCCESS"
+				var transferResp struct {
+					Status  string
+					SubCode string
+				}
+
+				if os.Getenv("ENV") == "development" {
+					transferResp.Status = mockTransferStatus
+					logx.Infof("【DEV】模拟支付宝转账成功，withdrawNo=%s, amount=%.2f, payee=%s",
+						withdrawal.WithdrawNo, withdrawal.ActualAmount, withdrawal.PayeeAccount)
+				} else {
+					// 生产环境：同步调用支付宝转账接口
+					outBizNo := withdrawal.WithdrawNo
+					resp, err := l.svcCtx.AlipayService.AliTransfer(transCtx, withdrawal.PayeeAccount, withdrawal.PayeeName, withdrawal.ActualAmount, "代理提现", outBizNo)
+					if err != nil {
+						// 调用失败：保持状态为待审核（1），只记录备注，方便管理员重试
+						withdrawal.Status = 1 // 待审核
+						withdrawal.Remark = sql.NullString{String: fmt.Sprintf("支付宝转账调用失败: %v", err), Valid: true}
+						_ = l.svcCtx.AgentWithdrawalModel.UpdateWithVersion(transCtx, session, withdrawal)
+
+						return errors.Wrapf(err, "支付宝转账失败")
+					}
+					transferResp.Status = resp.Status
+					transferResp.SubCode = resp.SubCode
+				}
+
+				// 4.2 根据转账结果更新状态
+				switch transferResp.Status {
+				case "SUCCESS":
+					// 转账成功
+					withdrawal.Status = 5 // 提现成功
+					if err := l.svcCtx.AgentWithdrawalModel.UpdateWithVersion(transCtx, session, withdrawal); err != nil {
+						return errors.Wrapf(err, "更新提现记录失败")
+					}
+
+					// 更新钱包（解冻并扣除）
+					wallet, err := l.svcCtx.AgentWalletModel.FindOneByAgentId(transCtx, withdrawal.AgentId)
+					if err != nil {
+						return errors.Wrapf(err, "查询钱包失败")
+					}
+					wallet.FrozenBalance -= withdrawal.Amount
+					wallet.WithdrawnAmount += withdrawal.Amount
+					if err := l.svcCtx.AgentWalletModel.UpdateWithVersion(transCtx, session, wallet); err != nil {
+						return errors.Wrapf(err, "更新钱包失败")
+					}
+
+					// 更新扣税记录状态
+					taxBuilder := l.svcCtx.AgentWithdrawalTaxModel.SelectBuilder().
+						Where("withdrawal_id = ?", withdrawal.Id)
+					taxRecords, err := l.svcCtx.AgentWithdrawalTaxModel.FindAll(transCtx, taxBuilder, "")
+					if err == nil && len(taxRecords) > 0 {
+						taxRecord := taxRecords[0]
+						taxRecord.TaxStatus = 2 // 已扣税
+						taxRecord.TaxTime = lzUtils.TimeToNullTime(time.Now())
+						l.svcCtx.AgentWithdrawalTaxModel.UpdateWithVersion(transCtx, session, taxRecord)
+					}
+
+				case "FAIL":
+					// 转账失败：保持待审核状态，方便人工处理或重试
+					withdrawal.Status = 1 // 待审核
+					errorMsg := l.mapAlipayError(transferResp.SubCode)
+					withdrawal.Remark = sql.NullString{String: errorMsg, Valid: true}
+					if err := l.svcCtx.AgentWithdrawalModel.UpdateWithVersion(transCtx, session, withdrawal); err != nil {
+						return errors.Wrapf(err, "更新提现记录失败")
+					}
+
+				case "DEALING":
+					// 处理中：同样保持待审核状态（1），由管理员后续确认
+					withdrawal.Status = 1
+					withdrawal.Remark = sql.NullString{String: "支付宝处理中，请稍后重试或联系平台", Valid: true}
+					if err := l.svcCtx.AgentWithdrawalModel.UpdateWithVersion(transCtx, session, withdrawal); err != nil {
+						return errors.Wrapf(err, "更新提现记录失败")
+					}
+				}
+			} else if withdrawal.WithdrawalType == 2 {
+				// 银行卡提现：审核通过即视为提现成功（线下已/将立即打款）
 				withdrawal.Status = 5 // 提现成功
+				withdrawal.Remark = sql.NullString{String: req.Remark, Valid: true}
 				if err := l.svcCtx.AgentWithdrawalModel.UpdateWithVersion(transCtx, session, withdrawal); err != nil {
 					return errors.Wrapf(err, "更新提现记录失败")
 				}
@@ -96,7 +187,7 @@ func (l *AdminAuditWithdrawalLogic) AdminAuditWithdrawal(req *types.AdminAuditWi
 
 				// 更新扣税记录状态
 				taxBuilder := l.svcCtx.AgentWithdrawalTaxModel.SelectBuilder().
-					Where("withdrawal_id = ? AND del_state = ?", withdrawal.Id, globalkey.DelStateNo)
+					Where("withdrawal_id = ?", withdrawal.Id)
 				taxRecords, err := l.svcCtx.AgentWithdrawalTaxModel.FindAll(transCtx, taxBuilder, "")
 				if err == nil && len(taxRecords) > 0 {
 					taxRecord := taxRecords[0]
@@ -104,27 +195,6 @@ func (l *AdminAuditWithdrawalLogic) AdminAuditWithdrawal(req *types.AdminAuditWi
 					taxRecord.TaxTime = lzUtils.TimeToNullTime(time.Now())
 					l.svcCtx.AgentWithdrawalTaxModel.UpdateWithVersion(transCtx, session, taxRecord)
 				}
-
-			case "FAIL":
-				// 转账失败
-				withdrawal.Status = 6 // 提现失败
-				errorMsg := l.mapAlipayError(transferResp.SubCode)
-				withdrawal.Remark = sql.NullString{String: errorMsg, Valid: true}
-				if err := l.svcCtx.AgentWithdrawalModel.UpdateWithVersion(transCtx, session, withdrawal); err != nil {
-					return errors.Wrapf(err, "更新提现记录失败")
-				}
-
-				// 解冻余额
-				wallet, err := l.svcCtx.AgentWalletModel.FindOneByAgentId(transCtx, withdrawal.AgentId)
-				if err == nil {
-					wallet.FrozenBalance -= withdrawal.Amount
-					wallet.Balance += withdrawal.Amount
-					l.svcCtx.AgentWalletModel.UpdateWithVersion(transCtx, session, wallet)
-				}
-
-			case "DEALING":
-				// 处理中，保持提现中状态，后续通过轮询更新
-				// 状态已经是4（提现中），无需更新
 			}
 
 		} else if req.Status == 3 { // 审核拒绝

app/main/api/internal/logic/admin_agent/admingetagentorderlistlogic.go

@@ -2,7 +2,6 @@ package admin_agent
 
 import (
 	"context"
-	"ycc-server/common/globalkey"
 	"ycc-server/common/xerr"
 
 	"github.com/Masterminds/squirrel"
@@ -29,8 +28,7 @@ func NewAdminGetAgentOrderListLogic(ctx context.Context, svcCtx *svc.ServiceCont
 }
 
 func (l *AdminGetAgentOrderListLogic) AdminGetAgentOrderList(req *types.AdminGetAgentOrderListReq) (resp *types.AdminGetAgentOrderListResp, err error) {
-	builder := l.svcCtx.AgentOrderModel.SelectBuilder().
-		Where("del_state = ?", globalkey.DelStateNo)
+	builder := l.svcCtx.AgentOrderModel.SelectBuilder()
 
 	if req.AgentId != nil {
 		builder = builder.Where("agent_id = ?", *req.AgentId)
@@ -42,6 +40,27 @@ func (l *AdminGetAgentOrderListLogic) AdminGetAgentOrderList(req *types.AdminGet
 		builder = builder.Where("process_status = ?", *req.ProcessStatus)
 	}
 
+	// 如果提供了订单状态筛选，先查询符合条件的订单ID列表
+	var filteredOrderIds []string
+	if req.OrderStatus != nil && *req.OrderStatus != "" {
+		orderBuilder := l.svcCtx.OrderModel.SelectBuilder().
+			Where("status = ?", *req.OrderStatus).
+			Columns("id")
+		orders, _ := l.svcCtx.OrderModel.FindAll(l.ctx, orderBuilder, "")
+		filteredOrderIds = make([]string, 0, len(orders))
+		for _, o := range orders {
+			filteredOrderIds = append(filteredOrderIds, o.Id)
+		}
+		// 如果没有符合条件的订单，直接返回空结果
+		if len(filteredOrderIds) == 0 {
+			return &types.AdminGetAgentOrderListResp{
+				Total: 0,
+				Items: []types.AgentOrderListItem{},
+			}, nil
+		}
+		builder = builder.Where(squirrel.Eq{"order_id": filteredOrderIds})
+	}
+
 	// 分页查询
 	page := req.Page
 	if page <= 0 {
@@ -74,9 +93,30 @@ func (l *AdminGetAgentOrderListLogic) AdminGetAgentOrderList(req *types.AdminGet
 		}
 	}
 
+	// 批量查询订单状态
+	orderIdSet := make(map[string]struct{})
+	for _, order := range orders {
+		orderIdSet[order.OrderId] = struct{}{}
+	}
+	orderIdList := make([]string, 0, len(orderIdSet))
+	for id := range orderIdSet {
+		orderIdList = append(orderIdList, id)
+	}
+	orderStatusMap := make(map[string]string)
+	if len(orderIdList) > 0 {
+		orderList, _ := l.svcCtx.OrderModel.FindAll(l.ctx, l.svcCtx.OrderModel.SelectBuilder().Where(squirrel.Eq{"id": orderIdList}), "")
+		for _, o := range orderList {
+			orderStatusMap[o.Id] = o.Status
+		}
+	}
+
 	// 组装响应
 	items := make([]types.AgentOrderListItem, 0, len(orders))
 	for _, order := range orders {
+		orderStatus := orderStatusMap[order.OrderId]
+		if orderStatus == "" {
+			orderStatus = "unknown" // 如果查询不到订单，默认为 unknown
+		}
 		items = append(items, types.AgentOrderListItem{
 			Id:              order.Id,
 			AgentId:         order.AgentId,
@@ -89,6 +129,7 @@ func (l *AdminGetAgentOrderListLogic) AdminGetAgentOrderList(req *types.AdminGet
 			PriceCost:       order.PriceCost,
 			AgentProfit:     order.AgentProfit,
 			ProcessStatus:   order.ProcessStatus,
+			OrderStatus:     orderStatus,
 			CreateTime:      order.CreateTime.Format("2006-01-02 15:04:05"),
 		})
 	}

app/main/api/internal/logic/admin_agent/admingetagentproductconfiglistlogic.go

@@ -28,8 +28,7 @@ func NewAdminGetAgentProductConfigListLogic(ctx context.Context, svcCtx *svc.Ser
 }
 
 func (l *AdminGetAgentProductConfigListLogic) AdminGetAgentProductConfigList(req *types.AdminGetAgentProductConfigListReq) (resp *types.AdminGetAgentProductConfigListResp, err error) {
-	builder := l.svcCtx.AgentProductConfigModel.SelectBuilder().
-		Where("del_state = ?", globalkey.DelStateNo)
+	builder := l.svcCtx.AgentProductConfigModel.SelectBuilder()
 
 	// 如果提供了产品ID，直接过滤
 	if req.ProductId != nil {

app/main/api/internal/logic/admin_agent/admingetagentrealnamelistlogic.go

@@ -2,7 +2,6 @@ package admin_agent
 
 import (
 	"context"
-	"ycc-server/common/globalkey"
 	"ycc-server/common/xerr"
 	"ycc-server/pkg/lzkit/crypto"
 
@@ -29,8 +28,7 @@ func NewAdminGetAgentRealNameListLogic(ctx context.Context, svcCtx *svc.ServiceC
 }
 
 func (l *AdminGetAgentRealNameListLogic) AdminGetAgentRealNameList(req *types.AdminGetAgentRealNameListReq) (resp *types.AdminGetAgentRealNameListResp, err error) {
-	builder := l.svcCtx.AgentRealNameModel.SelectBuilder().
-		Where("del_state = ?", globalkey.DelStateNo)
+	builder := l.svcCtx.AgentRealNameModel.SelectBuilder()
 
 	if req.AgentId != nil {
 		builder = builder.Where("agent_id = ?", *req.AgentId)

app/main/api/internal/logic/admin_agent/admingetagentrebatelistlogic.go

@@ -2,7 +2,6 @@ package admin_agent
 
 import (
 	"context"
-	"ycc-server/common/globalkey"
 	"ycc-server/common/xerr"
 
 	"github.com/Masterminds/squirrel"
@@ -29,8 +28,7 @@ func NewAdminGetAgentRebateListLogic(ctx context.Context, svcCtx *svc.ServiceCon
 }
 
 func (l *AdminGetAgentRebateListLogic) AdminGetAgentRebateList(req *types.AdminGetAgentRebateListReq) (resp *types.AdminGetAgentRebateListResp, err error) {
-	builder := l.svcCtx.AgentRebateModel.SelectBuilder().
-		Where("del_state = ?", globalkey.DelStateNo)
+	builder := l.svcCtx.AgentRebateModel.SelectBuilder()
 
 	if req.AgentId != nil {
 		builder = builder.Where("agent_id = ?", *req.AgentId)
@@ -41,6 +39,9 @@ func (l *AdminGetAgentRebateListLogic) AdminGetAgentRebateList(req *types.AdminG
 	if req.RebateType != nil {
 		builder = builder.Where("rebate_type = ?", *req.RebateType)
 	}
+	if req.Status != nil {
+		builder = builder.Where("status = ?", *req.Status)
+	}
 
 	// 分页查询
 	page := req.Page
@@ -84,6 +85,7 @@ func (l *AdminGetAgentRebateListLogic) AdminGetAgentRebateList(req *types.AdminG
 			OrderId:       rebate.OrderId,
 			RebateType:    rebate.RebateType,
 			Amount:        rebate.RebateAmount,
+			Status:        rebate.Status,
 			CreateTime:    rebate.CreateTime.Format("2006-01-02 15:04:05"),
 		})
 	}

app/main/api/internal/logic/admin_agent/admingetagentupgradelistlogic.go

@@ -2,7 +2,6 @@ package admin_agent
 
 import (
 	"context"
-	"ycc-server/common/globalkey"
 	"ycc-server/common/xerr"
 
 	"github.com/pkg/errors"
@@ -28,8 +27,7 @@ func NewAdminGetAgentUpgradeListLogic(ctx context.Context, svcCtx *svc.ServiceCo
 }
 
 func (l *AdminGetAgentUpgradeListLogic) AdminGetAgentUpgradeList(req *types.AdminGetAgentUpgradeListReq) (resp *types.AdminGetAgentUpgradeListResp, err error) {
-	builder := l.svcCtx.AgentUpgradeModel.SelectBuilder().
-		Where("del_state = ?", globalkey.DelStateNo)
+	builder := l.svcCtx.AgentUpgradeModel.SelectBuilder()
 
 	if req.AgentId != nil {
 		builder = builder.Where("agent_id = ?", *req.AgentId)

app/main/api/internal/logic/admin_agent/admingetagentwithdrawallistlogic.go

@@ -49,6 +49,17 @@ func (l *AdminGetAgentWithdrawalListLogic) AdminGetAgentWithdrawalList(req *type
 			item.Remark = v.Remark.String
 		}
 		item.CreateTime = v.CreateTime.Format("2006-01-02 15:04:05")
+
+		// 如果是银行卡提现，填充银行卡信息
+		if v.WithdrawalType == 2 {
+			if v.BankCardNo.Valid {
+				item.BankCardNo = v.BankCardNo.String
+			}
+			if v.BankName.Valid {
+				item.BankName = v.BankName.String
+			}
+		}
+
 		items = append(items, item)
 	}
 	resp = &types.AdminGetAgentWithdrawalListResp{

app/main/api/internal/logic/admin_agent/admingetinvitecodelistlogic.go

@@ -2,7 +2,6 @@ package admin_agent
 
 import (
 	"context"
-	"ycc-server/common/globalkey"
 	"ycc-server/common/xerr"
 	"ycc-server/pkg/lzkit/crypto"
 
@@ -31,8 +30,7 @@ func NewAdminGetInviteCodeListLogic(ctx context.Context, svcCtx *svc.ServiceCont
 
 func (l *AdminGetInviteCodeListLogic) AdminGetInviteCodeList(req *types.AdminGetInviteCodeListReq) (resp *types.AdminGetInviteCodeListResp, err error) {
 	// 1. 构建查询条件
-	builder := l.svcCtx.AgentInviteCodeModel.SelectBuilder().
-		Where("del_state = ?", globalkey.DelStateNo)
+	builder := l.svcCtx.AgentInviteCodeModel.SelectBuilder()
 
 	if req.Code != nil && *req.Code != "" {
 		builder = builder.Where("code = ?", *req.Code)

app/main/api/internal/logic/admin_complaint/admingetcomplaintdetaillogic.go

@@ -0,0 +1,188 @@
+package admin_complaint
+
+import (
+	"context"
+	"encoding/json"
+	"strconv"
+	"ycc-server/app/main/api/internal/svc"
+	"ycc-server/app/main/api/internal/types"
+	"ycc-server/app/main/model"
+	"ycc-server/common/xerr"
+	"ycc-server/pkg/lzkit/lzUtils"
+
+	"github.com/pkg/errors"
+	"github.com/zeromicro/go-zero/core/logx"
+)
+
+type AdminGetComplaintDetailLogic struct {
+	logx.Logger
+	ctx    context.Context
+	svcCtx *svc.ServiceContext
+}
+
+func NewAdminGetComplaintDetailLogic(ctx context.Context, svcCtx *svc.ServiceContext) *AdminGetComplaintDetailLogic {
+	return &AdminGetComplaintDetailLogic{
+		Logger: logx.WithContext(ctx),
+		ctx:    ctx,
+		svcCtx: svcCtx,
+	}
+}
+
+func (l *AdminGetComplaintDetailLogic) AdminGetComplaintDetail(req *types.AdminGetComplaintDetailReq) (resp *types.AdminGetComplaintDetailResp, err error) {
+	// 获取投诉主表信息
+	complaint, err := l.svcCtx.ComplaintMainModel.FindOne(l.ctx, req.Id)
+	if err != nil {
+		return nil, errors.Wrapf(xerr.NewErrCode(xerr.DB_ERROR), "AdminGetComplaintDetail, 查询投诉失败 err: %v", err)
+	}
+
+	// 构建响应
+	resp = &types.AdminGetComplaintDetailResp{
+		Id:                complaint.Id,
+		Type:              complaint.Type,
+		OrderId:           lzUtils.NullStringToString(complaint.OrderId),
+		Name:              lzUtils.NullStringToString(complaint.Name),
+		Contact:           lzUtils.NullStringToString(complaint.Contact),
+		Content:           lzUtils.NullStringToString(complaint.Content),
+		Status:            lzUtils.NullStringToString(complaint.Status),
+		StatusDescription: lzUtils.NullStringToString(complaint.StatusDescription),
+		Remark:            lzUtils.NullStringToString(complaint.Remark),
+		HandlerId:         lzUtils.NullStringToString(complaint.HandlerId),
+		CreateTime:        complaint.CreateTime.Format("2006-01-02 15:04:05"),
+		UpdateTime:        complaint.UpdateTime.Format("2006-01-02 15:04:05"),
+	}
+
+	if complaint.HandleTime.Valid {
+		resp.HandleTime = complaint.HandleTime.Time.Format("2006-01-02 15:04:05")
+	}
+
+	// 获取支付宝投诉详情
+	if complaint.Type == "alipay" {
+		alipayBuilder := l.svcCtx.ComplaintAlipayModel.SelectBuilder().
+			Where("complaint_id = ?", complaint.Id)
+		alipayComplaints, err := l.svcCtx.ComplaintAlipayModel.FindAll(l.ctx, alipayBuilder, "")
+		if err != nil && !errors.Is(err, model.ErrNotFound) {
+			return nil, errors.Wrapf(xerr.NewErrCode(xerr.DB_ERROR), "AdminGetComplaintDetail, 查询支付宝投诉失败 err: %v", err)
+		}
+
+		if len(alipayComplaints) > 0 {
+			alipayComplaint := alipayComplaints[0]
+			alipayDetail := &types.AlipayComplaintDetail{
+				Id:                alipayComplaint.Id,
+				AlipayId:          alipayComplaint.AlipayId,
+				TaskId:            alipayComplaint.TaskId,
+				OppositePid:       lzUtils.NullStringToString(alipayComplaint.OppositePid),
+				OppositeName:      lzUtils.NullStringToString(alipayComplaint.OppositeName),
+				ComplainContent:   lzUtils.NullStringToString(alipayComplaint.ComplainContent),
+				TradeNo:           lzUtils.NullStringToString(alipayComplaint.TradeNo),
+				Status:            lzUtils.NullStringToString(alipayComplaint.Status),
+				StatusDescription: lzUtils.NullStringToString(alipayComplaint.StatusDescription),
+				ProcessCode:       lzUtils.NullStringToString(alipayComplaint.ProcessCode),
+				ProcessMessage:    lzUtils.NullStringToString(alipayComplaint.ProcessMessage),
+				ProcessRemark:     lzUtils.NullStringToString(alipayComplaint.ProcessRemark),
+				ComplainUrl:       lzUtils.NullStringToString(alipayComplaint.ComplainUrl),
+			}
+
+			if alipayComplaint.ComplainAmount.Valid {
+				alipayDetail.ComplainAmount = strconv.FormatFloat(alipayComplaint.ComplainAmount.Float64, 'f', -1, 64)
+			}
+			if alipayComplaint.GmtComplain.Valid {
+				alipayDetail.GmtComplain = alipayComplaint.GmtComplain.Time.Format("2006-01-02 15:04:05")
+			}
+			if alipayComplaint.GmtProcess.Valid {
+				alipayDetail.GmtProcess = alipayComplaint.GmtProcess.Time.Format("2006-01-02 15:04:05")
+			}
+			if alipayComplaint.GmtOverdue.Valid {
+				alipayDetail.GmtOverdue = alipayComplaint.GmtOverdue.Time.Format("2006-01-02 15:04:05")
+			}
+			if alipayComplaint.GmtRiskFinishTime.Valid {
+				alipayDetail.GmtRiskFinishTime = alipayComplaint.GmtRiskFinishTime.Time.Format("2006-01-02 15:04:05")
+			}
+
+			// 解析图片列表
+			if alipayComplaint.ProcessImgUrlList.Valid {
+				var imgList []string
+				if err := json.Unmarshal([]byte(alipayComplaint.ProcessImgUrlList.String), &imgList); err == nil {
+					alipayDetail.ProcessImgUrlList = imgList
+				}
+			}
+			if alipayComplaint.CertifyInfo.Valid {
+				var certifyList []string
+				if err := json.Unmarshal([]byte(alipayComplaint.CertifyInfo.String), &certifyList); err == nil {
+					alipayDetail.CertifyInfo = certifyList
+				}
+			}
+
+			// 获取交易信息列表
+			tradeBuilder := l.svcCtx.ComplaintAlipayTradeModel.SelectBuilder().
+				Where("complaint_alipay_id = ?", alipayComplaint.Id)
+			trades, err := l.svcCtx.ComplaintAlipayTradeModel.FindAll(l.ctx, tradeBuilder, "")
+			if err != nil && !errors.Is(err, model.ErrNotFound) {
+				return nil, errors.Wrapf(xerr.NewErrCode(xerr.DB_ERROR), "AdminGetComplaintDetail, 查询交易信息失败 err: %v", err)
+			}
+
+			alipayDetail.TradeInfoList = make([]types.AlipayComplaintTradeInfo, 0, len(trades))
+			for _, trade := range trades {
+				tradeInfo := types.AlipayComplaintTradeInfo{
+					Id:                trade.Id,
+					TradeNo:           lzUtils.NullStringToString(trade.TradeNo),
+					OutNo:             lzUtils.NullStringToString(trade.OutNo),
+					Status:            lzUtils.NullStringToString(trade.Status),
+					StatusDescription: lzUtils.NullStringToString(trade.StatusDescription),
+				}
+
+				if trade.AlipayTradeId.Valid {
+					tradeInfo.AlipayTradeId = strconv.FormatInt(trade.AlipayTradeId.Int64, 10)
+				}
+				if trade.AlipayComplaintRecordId.Valid {
+					tradeInfo.AlipayComplaintRecordId = strconv.FormatInt(trade.AlipayComplaintRecordId.Int64, 10)
+				}
+				if trade.GmtTrade.Valid {
+					tradeInfo.GmtTrade = trade.GmtTrade.Time.Format("2006-01-02 15:04:05")
+				}
+				if trade.GmtRefund.Valid {
+					tradeInfo.GmtRefund = trade.GmtRefund.Time.Format("2006-01-02 15:04:05")
+				}
+				if trade.Amount.Valid {
+					tradeInfo.Amount = strconv.FormatFloat(trade.Amount.Float64, 'f', -1, 64)
+				}
+
+				alipayDetail.TradeInfoList = append(alipayDetail.TradeInfoList, tradeInfo)
+			}
+
+			resp.AlipayComplaint = alipayDetail
+		}
+	}
+
+	// 获取主动投诉详情
+	if complaint.Type == "manual" {
+		manualBuilder := l.svcCtx.ComplaintManualModel.SelectBuilder().
+			Where("complaint_id = ?", complaint.Id)
+		manualComplaints, err := l.svcCtx.ComplaintManualModel.FindAll(l.ctx, manualBuilder, "")
+		if err != nil && !errors.Is(err, model.ErrNotFound) {
+			return nil, errors.Wrapf(xerr.NewErrCode(xerr.DB_ERROR), "AdminGetComplaintDetail, 查询主动投诉失败 err: %v", err)
+		}
+
+		if len(manualComplaints) > 0 {
+			manualComplaint := manualComplaints[0]
+			manualDetail := &types.ManualComplaintDetail{
+				Id:       manualComplaint.Id,
+				UserId:   lzUtils.NullStringToString(manualComplaint.UserId),
+				Subject:  lzUtils.NullStringToString(manualComplaint.Subject),
+				Priority: lzUtils.NullStringToString(manualComplaint.Priority),
+				Source:   lzUtils.NullStringToString(manualComplaint.Source),
+			}
+
+			// 解析附件URL列表
+			if manualComplaint.AttachmentUrls.Valid {
+				var urlList []string
+				if err := json.Unmarshal([]byte(manualComplaint.AttachmentUrls.String), &urlList); err == nil {
+					manualDetail.AttachmentUrls = urlList
+				}
+			}
+
+			resp.ManualComplaint = manualDetail
+		}
+	}
+
+	return resp, nil
+}

app/main/api/internal/logic/admin_complaint/admingetcomplaintlistlogic.go

@@ -0,0 +1,174 @@
+package admin_complaint
+
+import (
+	"context"
+	"strconv"
+	"ycc-server/app/main/api/internal/svc"
+	"ycc-server/app/main/api/internal/types"
+	"ycc-server/app/main/model"
+	"ycc-server/common/xerr"
+	"ycc-server/pkg/lzkit/lzUtils"
+
+	"github.com/Masterminds/squirrel"
+	"github.com/pkg/errors"
+	"github.com/zeromicro/go-zero/core/logx"
+	"github.com/zeromicro/go-zero/core/mr"
+)
+
+type AdminGetComplaintListLogic struct {
+	logx.Logger
+	ctx    context.Context
+	svcCtx *svc.ServiceContext
+}
+
+func NewAdminGetComplaintListLogic(ctx context.Context, svcCtx *svc.ServiceContext) *AdminGetComplaintListLogic {
+	return &AdminGetComplaintListLogic{
+		Logger: logx.WithContext(ctx),
+		ctx:    ctx,
+		svcCtx: svcCtx,
+	}
+}
+
+func (l *AdminGetComplaintListLogic) AdminGetComplaintList(req *types.AdminGetComplaintListReq) (resp *types.AdminGetComplaintListResp, err error) {
+	// 构建查询条件
+	builder := l.svcCtx.ComplaintMainModel.SelectBuilder()
+	if req.Type != "" {
+		builder = builder.Where("type = ?", req.Type)
+	}
+	if req.Status != "" {
+		builder = builder.Where("status = ?", req.Status)
+	}
+	if req.Name != "" {
+		builder = builder.Where("name LIKE ?", "%"+req.Name+"%")
+	}
+	if req.Contact != "" {
+		builder = builder.Where("contact LIKE ?", "%"+req.Contact+"%")
+	}
+	if req.OrderId != "" {
+		builder = builder.Where("order_id = ?", req.OrderId)
+	}
+	// 时间范围查询
+	if req.CreateTimeStart != "" {
+		builder = builder.Where("create_time >= ?", req.CreateTimeStart)
+	}
+	if req.CreateTimeEnd != "" {
+		builder = builder.Where("create_time <= ?", req.CreateTimeEnd)
+	}
+	if req.HandleTimeStart != "" {
+		builder = builder.Where("handle_time >= ?", req.HandleTimeStart)
+	}
+	if req.HandleTimeEnd != "" {
+		builder = builder.Where("handle_time <= ?", req.HandleTimeEnd)
+	}
+
+	// 并发获取总数和列表
+	var total int64
+	var complaints []*model.ComplaintMain
+	err = mr.Finish(func() error {
+		var err error
+		total, err = l.svcCtx.ComplaintMainModel.FindCount(l.ctx, builder, "id")
+		if err != nil {
+			return errors.Wrapf(xerr.NewErrCode(xerr.DB_ERROR), "AdminGetComplaintList, 查询投诉总数失败 err: %v", err)
+		}
+		return nil
+	}, func() error {
+		var err error
+		complaints, err = l.svcCtx.ComplaintMainModel.FindPageListByPage(l.ctx, builder, req.Page, req.PageSize, "create_time DESC")
+		if err != nil {
+			return errors.Wrapf(xerr.NewErrCode(xerr.DB_ERROR), "AdminGetComplaintList, 查询投诉列表失败 err: %v", err)
+		}
+		return nil
+	})
+	if err != nil {
+		return nil, err
+	}
+
+	// 构建响应
+	resp = &types.AdminGetComplaintListResp{
+		Total: total,
+		Items: make([]types.ComplaintListItem, 0, len(complaints)),
+	}
+
+	// 批量获取支付宝投诉和主动投诉的详细信息
+	complaintIds := make([]string, 0, len(complaints))
+	for _, complaint := range complaints {
+		complaintIds = append(complaintIds, complaint.Id)
+	}
+
+	// 获取支付宝投诉信息
+	alipayComplaintMap := make(map[string]*model.ComplaintAlipay)
+	if len(complaintIds) > 0 {
+		alipayBuilder := l.svcCtx.ComplaintAlipayModel.SelectBuilder().
+			Where(squirrel.Eq{"complaint_id": complaintIds})
+		alipayComplaints, err := l.svcCtx.ComplaintAlipayModel.FindAll(l.ctx, alipayBuilder, "")
+		if err != nil && !errors.Is(err, model.ErrNotFound) {
+			return nil, errors.Wrapf(xerr.NewErrCode(xerr.DB_ERROR), "AdminGetComplaintList, 批量查询支付宝投诉失败 err: %v", err)
+		}
+		for _, alipayComplaint := range alipayComplaints {
+			alipayComplaintMap[alipayComplaint.ComplaintId] = alipayComplaint
+		}
+	}
+
+	// 获取主动投诉信息
+	manualComplaintMap := make(map[string]*model.ComplaintManual)
+	if len(complaintIds) > 0 {
+		manualBuilder := l.svcCtx.ComplaintManualModel.SelectBuilder().
+			Where(squirrel.Eq{"complaint_id": complaintIds})
+		manualComplaints, err := l.svcCtx.ComplaintManualModel.FindAll(l.ctx, manualBuilder, "")
+		if err != nil && !errors.Is(err, model.ErrNotFound) {
+			return nil, errors.Wrapf(xerr.NewErrCode(xerr.DB_ERROR), "AdminGetComplaintList, 批量查询主动投诉失败 err: %v", err)
+		}
+		for _, manualComplaint := range manualComplaints {
+			manualComplaintMap[manualComplaint.ComplaintId] = manualComplaint
+		}
+	}
+
+	// 构建列表项
+	for _, complaint := range complaints {
+		item := types.ComplaintListItem{
+			Id:                complaint.Id,
+			Type:              complaint.Type,
+			OrderId:           lzUtils.NullStringToString(complaint.OrderId),
+			Name:              lzUtils.NullStringToString(complaint.Name),
+			Contact:           lzUtils.NullStringToString(complaint.Contact),
+			Content:           lzUtils.NullStringToString(complaint.Content),
+			Status:            lzUtils.NullStringToString(complaint.Status),
+			StatusDescription: lzUtils.NullStringToString(complaint.StatusDescription),
+			Remark:            lzUtils.NullStringToString(complaint.Remark),
+			HandlerId:         lzUtils.NullStringToString(complaint.HandlerId),
+			CreateTime:        complaint.CreateTime.Format("2006-01-02 15:04:05"),
+			UpdateTime:        complaint.UpdateTime.Format("2006-01-02 15:04:05"),
+		}
+
+		if complaint.HandleTime.Valid {
+			item.HandleTime = complaint.HandleTime.Time.Format("2006-01-02 15:04:05")
+		}
+
+		// 填充支付宝投诉特有字段
+		if complaint.Type == "alipay" {
+			if alipayComplaint, ok := alipayComplaintMap[complaint.Id]; ok {
+				item.TaskId = alipayComplaint.TaskId
+				item.TradeNo = lzUtils.NullStringToString(alipayComplaint.TradeNo)
+				if alipayComplaint.ComplainAmount.Valid {
+					item.ComplainAmount = strconv.FormatFloat(alipayComplaint.ComplainAmount.Float64, 'f', -1, 64)
+				}
+				if alipayComplaint.GmtComplain.Valid {
+					item.GmtComplain = alipayComplaint.GmtComplain.Time.Format("2006-01-02 15:04:05")
+				}
+			}
+		}
+
+		// 填充主动投诉特有字段
+		if complaint.Type == "manual" {
+			if manualComplaint, ok := manualComplaintMap[complaint.Id]; ok {
+				item.Subject = lzUtils.NullStringToString(manualComplaint.Subject)
+				item.Priority = lzUtils.NullStringToString(manualComplaint.Priority)
+				item.Source = lzUtils.NullStringToString(manualComplaint.Source)
+			}
+		}
+
+		resp.Items = append(resp.Items, item)
+	}
+
+	return resp, nil
+}

app/main/api/internal/logic/admin_complaint/adminupdatecomplaintremarklogic.go

@@ -0,0 +1,47 @@
+package admin_complaint
+
+import (
+	"context"
+	"ycc-server/app/main/api/internal/svc"
+	"ycc-server/app/main/api/internal/types"
+	"ycc-server/common/xerr"
+	"ycc-server/pkg/lzkit/lzUtils"
+
+	"github.com/pkg/errors"
+	"github.com/zeromicro/go-zero/core/logx"
+)
+
+type AdminUpdateComplaintRemarkLogic struct {
+	logx.Logger
+	ctx    context.Context
+	svcCtx *svc.ServiceContext
+}
+
+func NewAdminUpdateComplaintRemarkLogic(ctx context.Context, svcCtx *svc.ServiceContext) *AdminUpdateComplaintRemarkLogic {
+	return &AdminUpdateComplaintRemarkLogic{
+		Logger: logx.WithContext(ctx),
+		ctx:    ctx,
+		svcCtx: svcCtx,
+	}
+}
+
+func (l *AdminUpdateComplaintRemarkLogic) AdminUpdateComplaintRemark(req *types.AdminUpdateComplaintRemarkReq) (resp *types.AdminUpdateComplaintRemarkResp, err error) {
+	// 获取投诉主表信息
+	complaint, err := l.svcCtx.ComplaintMainModel.FindOne(l.ctx, req.Id)
+	if err != nil {
+		return nil, errors.Wrapf(xerr.NewErrCode(xerr.DB_ERROR), "AdminUpdateComplaintRemark, 查询投诉失败 err: %v", err)
+	}
+
+	// 更新备注
+	complaint.Remark = lzUtils.StringToNullString(req.Remark)
+
+	// 更新数据库
+	err = l.svcCtx.ComplaintMainModel.UpdateWithVersion(l.ctx, nil, complaint)
+	if err != nil {
+		return nil, errors.Wrapf(xerr.NewErrCode(xerr.DB_ERROR), "AdminUpdateComplaintRemark, 更新投诉备注失败 err: %v", err)
+	}
+
+	return &types.AdminUpdateComplaintRemarkResp{
+		Success: true,
+	}, nil
+}

app/main/api/internal/logic/admin_complaint/adminupdatecomplaintstatuslogic.go

@@ -0,0 +1,55 @@
+package admin_complaint
+
+import (
+	"context"
+	"time"
+	"ycc-server/app/main/api/internal/svc"
+	"ycc-server/app/main/api/internal/types"
+	"ycc-server/common/xerr"
+	"ycc-server/pkg/lzkit/lzUtils"
+
+	"github.com/pkg/errors"
+	"github.com/zeromicro/go-zero/core/logx"
+)
+
+type AdminUpdateComplaintStatusLogic struct {
+	logx.Logger
+	ctx    context.Context
+	svcCtx *svc.ServiceContext
+}
+
+func NewAdminUpdateComplaintStatusLogic(ctx context.Context, svcCtx *svc.ServiceContext) *AdminUpdateComplaintStatusLogic {
+	return &AdminUpdateComplaintStatusLogic{
+		Logger: logx.WithContext(ctx),
+		ctx:    ctx,
+		svcCtx: svcCtx,
+	}
+}
+
+func (l *AdminUpdateComplaintStatusLogic) AdminUpdateComplaintStatus(req *types.AdminUpdateComplaintStatusReq) (resp *types.AdminUpdateComplaintStatusResp, err error) {
+	// 获取投诉主表信息
+	complaint, err := l.svcCtx.ComplaintMainModel.FindOne(l.ctx, req.Id)
+	if err != nil {
+		return nil, errors.Wrapf(xerr.NewErrCode(xerr.DB_ERROR), "AdminUpdateComplaintStatus, 查询投诉失败 err: %v", err)
+	}
+
+	// 更新状态
+	complaint.Status = lzUtils.StringToNullString(req.Status)
+	if req.StatusDescription != "" {
+		complaint.StatusDescription = lzUtils.StringToNullString(req.StatusDescription)
+	}
+	if req.HandlerId != "" {
+		complaint.HandlerId = lzUtils.StringToNullString(req.HandlerId)
+		complaint.HandleTime = lzUtils.TimeToNullTime(time.Now())
+	}
+
+	// 更新数据库
+	err = l.svcCtx.ComplaintMainModel.UpdateWithVersion(l.ctx, nil, complaint)
+	if err != nil {
+		return nil, errors.Wrapf(xerr.NewErrCode(xerr.DB_ERROR), "AdminUpdateComplaintStatus, 更新投诉状态失败 err: %v", err)
+	}
+
+	return &types.AdminUpdateComplaintStatusResp{
+		Success: true,
+	}, nil
+}

app/main/api/internal/logic/admin_dashboard/admingetdashboardstatisticslogic.go

@@ -0,0 +1,381 @@
+package admin_dashboard
+
+import (
+	"context"
+	"time"
+	"ycc-server/common/globalkey"
+	"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 AdminGetDashboardStatisticsLogic struct {
+	logx.Logger
+	ctx    context.Context
+	svcCtx *svc.ServiceContext
+}
+
+func NewAdminGetDashboardStatisticsLogic(ctx context.Context, svcCtx *svc.ServiceContext) *AdminGetDashboardStatisticsLogic {
+	return &AdminGetDashboardStatisticsLogic{
+		Logger: logx.WithContext(ctx),
+		ctx:    ctx,
+		svcCtx: svcCtx,
+	}
+}
+
+func (l *AdminGetDashboardStatisticsLogic) AdminGetDashboardStatistics() (resp *types.AdminGetDashboardStatisticsResp, err error) {
+	// 使用Asia/Shanghai时区
+	loc, _ := time.LoadLocation("Asia/Shanghai")
+	now := time.Now().In(loc)
+
+	// 计算时间范围
+	todayStart := time.Date(now.Year(), now.Month(), now.Day(), 0, 0, 0, 0, loc)
+	todayEnd := todayStart.AddDate(0, 0, 1)
+	yesterdayStart := todayStart.AddDate(0, 0, -1)
+	yesterdayEnd := todayStart
+	monthStart := time.Date(now.Year(), now.Month(), 1, 0, 0, 0, 0, loc)
+	monthEnd := monthStart.AddDate(0, 1, 0)
+
+	// 1. 订单统计
+	orderStats, err := l.calculateOrderStatistics(todayStart, todayEnd, yesterdayStart, yesterdayEnd, monthStart, monthEnd)
+	if err != nil {
+		return nil, errors.Wrapf(xerr.NewErrCode(xerr.DB_ERROR), "计算订单统计失败, %v", err)
+	}
+
+	// 2. 营收统计
+	revenueStats, err := l.calculateRevenueStatistics(todayStart, todayEnd, yesterdayStart, yesterdayEnd, monthStart, monthEnd)
+	if err != nil {
+		return nil, errors.Wrapf(xerr.NewErrCode(xerr.DB_ERROR), "计算营收统计失败, %v", err)
+	}
+
+	// 3. 代理统计
+	agentStats, err := l.calculateAgentStatistics(todayStart, monthStart)
+	if err != nil {
+		return nil, errors.Wrapf(xerr.NewErrCode(xerr.DB_ERROR), "计算代理统计失败, %v", err)
+	}
+
+	// 4. 利润统计
+	profitStats, err := l.calculateProfitStatistics(todayStart, todayEnd, monthStart, monthEnd, revenueStats)
+	if err != nil {
+		return nil, errors.Wrapf(xerr.NewErrCode(xerr.DB_ERROR), "计算利润统计失败, %v", err)
+	}
+
+	// 5. 订单趋势（最近7天）
+	orderTrend, err := l.calculateOrderTrend(now, loc)
+	if err != nil {
+		return nil, errors.Wrapf(xerr.NewErrCode(xerr.DB_ERROR), "计算订单趋势失败, %v", err)
+	}
+
+	// 6. 营收趋势（最近7天）
+	revenueTrend, err := l.calculateRevenueTrend(now, loc)
+	if err != nil {
+		return nil, errors.Wrapf(xerr.NewErrCode(xerr.DB_ERROR), "计算营收趋势失败, %v", err)
+	}
+
+	return &types.AdminGetDashboardStatisticsResp{
+		OrderStats:   orderStats,
+		RevenueStats: revenueStats,
+		AgentStats:   agentStats,
+		ProfitStats:  profitStats,
+		OrderTrend:   orderTrend,
+		RevenueTrend: revenueTrend,
+	}, nil
+}
+
+// calculateOrderStatistics 计算订单统计
+func (l *AdminGetDashboardStatisticsLogic) calculateOrderStatistics(todayStart, todayEnd, yesterdayStart, yesterdayEnd, monthStart, monthEnd time.Time) (types.AdminOrderStatistics, error) {
+	var stats types.AdminOrderStatistics
+
+	// 今日订单数
+	todayBuilder := l.svcCtx.OrderModel.SelectBuilder().
+		Where("status = ? AND create_time >= ? AND create_time < ?", "paid", todayStart, todayEnd)
+	todayCount, err := l.svcCtx.OrderModel.FindCount(l.ctx, todayBuilder, "id")
+	if err != nil {
+		return stats, err
+	}
+	stats.TodayCount = todayCount
+
+	// 昨日订单数
+	yesterdayBuilder := l.svcCtx.OrderModel.SelectBuilder().
+		Where("status = ? AND create_time >= ? AND create_time < ?", "paid", yesterdayStart, yesterdayEnd)
+	yesterdayCount, err := l.svcCtx.OrderModel.FindCount(l.ctx, yesterdayBuilder, "id")
+	if err != nil {
+		return stats, err
+	}
+	stats.YesterdayCount = yesterdayCount
+
+	// 当月订单数
+	monthBuilder := l.svcCtx.OrderModel.SelectBuilder().
+		Where("status = ? AND create_time >= ? AND create_time < ?", "paid", monthStart, monthEnd)
+	monthCount, err := l.svcCtx.OrderModel.FindCount(l.ctx, monthBuilder, "id")
+	if err != nil {
+		return stats, err
+	}
+	stats.MonthCount = monthCount
+
+	// 总订单数
+	totalBuilder := l.svcCtx.OrderModel.SelectBuilder().
+		Where("status = ?", "paid")
+	totalCount, err := l.svcCtx.OrderModel.FindCount(l.ctx, totalBuilder, "id")
+	if err != nil {
+		return stats, err
+	}
+	stats.TotalCount = totalCount
+
+	// 计算变化率
+	if stats.YesterdayCount > 0 {
+		stats.ChangeRate = float64(stats.TodayCount-stats.YesterdayCount) / float64(stats.YesterdayCount) * 100
+	} else if stats.TodayCount > 0 {
+		stats.ChangeRate = 100 // 从0增长到有值，算100%增长
+	}
+
+	return stats, nil
+}
+
+// calculateRevenueStatistics 计算营收统计
+func (l *AdminGetDashboardStatisticsLogic) calculateRevenueStatistics(todayStart, todayEnd, yesterdayStart, yesterdayEnd, monthStart, monthEnd time.Time) (types.AdminRevenueStatistics, error) {
+	var stats types.AdminRevenueStatistics
+
+	// 今日营收
+	todayBuilder := l.svcCtx.OrderModel.SelectBuilder().
+		Where("status = ? AND create_time >= ? AND create_time < ?", "paid", todayStart, todayEnd)
+	todayAmount, err := l.svcCtx.OrderModel.FindSum(l.ctx, todayBuilder, "amount")
+	if err != nil {
+		return stats, err
+	}
+	stats.TodayAmount = todayAmount
+
+	// 昨日营收
+	yesterdayBuilder := l.svcCtx.OrderModel.SelectBuilder().
+		Where("status = ? AND create_time >= ? AND create_time < ?", "paid", yesterdayStart, yesterdayEnd)
+	yesterdayAmount, err := l.svcCtx.OrderModel.FindSum(l.ctx, yesterdayBuilder, "amount")
+	if err != nil {
+		return stats, err
+	}
+	stats.YesterdayAmount = yesterdayAmount
+
+	// 当月营收
+	monthBuilder := l.svcCtx.OrderModel.SelectBuilder().
+		Where("status = ? AND create_time >= ? AND create_time < ?", "paid", monthStart, monthEnd)
+	monthAmount, err := l.svcCtx.OrderModel.FindSum(l.ctx, monthBuilder, "amount")
+	if err != nil {
+		return stats, err
+	}
+	stats.MonthAmount = monthAmount
+
+	// 总营收
+	totalBuilder := l.svcCtx.OrderModel.SelectBuilder().
+		Where("status = ?", "paid")
+	totalAmount, err := l.svcCtx.OrderModel.FindSum(l.ctx, totalBuilder, "amount")
+	if err != nil {
+		return stats, err
+	}
+	stats.TotalAmount = totalAmount
+
+	// 计算变化率
+	if stats.YesterdayAmount > 0 {
+		stats.ChangeRate = (stats.TodayAmount - stats.YesterdayAmount) / stats.YesterdayAmount * 100
+	} else if stats.TodayAmount > 0 {
+		stats.ChangeRate = 100 // 从0增长到有值，算100%增长
+	}
+
+	return stats, nil
+}
+
+// calculateAgentStatistics 计算代理统计
+func (l *AdminGetDashboardStatisticsLogic) calculateAgentStatistics(todayStart, monthStart time.Time) (types.AdminAgentStatistics, error) {
+	var stats types.AdminAgentStatistics
+
+	// 代理总数
+	totalBuilder := l.svcCtx.AgentModel.SelectBuilder()
+	totalCount, err := l.svcCtx.AgentModel.FindCount(l.ctx, totalBuilder, "id")
+	if err != nil {
+		return stats, err
+	}
+	stats.TotalCount = totalCount
+
+	// 今日新增
+	todayBuilder := l.svcCtx.AgentModel.SelectBuilder().
+		Where("create_time >= ?", todayStart)
+	todayNew, err := l.svcCtx.AgentModel.FindCount(l.ctx, todayBuilder, "id")
+	if err != nil {
+		return stats, err
+	}
+	stats.TodayNew = todayNew
+
+	// 当月新增
+	monthBuilder := l.svcCtx.AgentModel.SelectBuilder().
+		Where("create_time >= ?", monthStart)
+	monthNew, err := l.svcCtx.AgentModel.FindCount(l.ctx, monthBuilder, "id")
+	if err != nil {
+		return stats, err
+	}
+	stats.MonthNew = monthNew
+
+	return stats, nil
+}
+
+// calculateProfitStatistics 计算利润统计
+func (l *AdminGetDashboardStatisticsLogic) calculateProfitStatistics(todayStart, todayEnd, monthStart, monthEnd time.Time, revenueStats types.AdminRevenueStatistics) (types.AdminProfitStatistics, error) {
+	var stats types.AdminProfitStatistics
+
+	// 公司交税比例（6%）
+	const companyTaxRate = 0.06
+
+	// 今日利润计算
+	// 今日营收
+	todayRevenue := revenueStats.TodayAmount
+	// 今日佣金
+	todayCommissionBuilder := l.svcCtx.AgentCommissionModel.SelectBuilder().
+		Where("del_state = ? AND status != ? AND create_time >= ? AND create_time < ?", globalkey.DelStateNo, 3, todayStart, todayEnd)
+	todayCommission, err := l.svcCtx.AgentCommissionModel.FindSum(l.ctx, todayCommissionBuilder, "amount")
+	if err != nil {
+		return stats, err
+	}
+	// 今日返利
+	todayRebateBuilder := l.svcCtx.AgentRebateModel.SelectBuilder().
+		Where("del_state = ? AND status != ? AND create_time >= ? AND create_time < ?", globalkey.DelStateNo, 3, todayStart, todayEnd)
+	todayRebate, err := l.svcCtx.AgentRebateModel.FindSum(l.ctx, todayRebateBuilder, "rebate_amount")
+	if err != nil {
+		return stats, err
+	}
+	// 今日公司交税（订单金额的6%）
+	todayCompanyTax := todayRevenue * companyTaxRate
+	// 今日平台收入税（agent_withdrawal_tax表中tax_status=2的tax_amount总和）
+	todayTaxIncomeBuilder := l.svcCtx.AgentWithdrawalTaxModel.SelectBuilder().
+		Where("del_state = ? AND tax_status = ? AND create_time >= ? AND create_time < ?", globalkey.DelStateNo, 2, todayStart, todayEnd)
+	todayTaxIncome, err := l.svcCtx.AgentWithdrawalTaxModel.FindSum(l.ctx, todayTaxIncomeBuilder, "tax_amount")
+	if err != nil {
+		return stats, err
+	}
+	// 今日利润 = 营收 - 佣金 - 返利 - 公司交税 + 平台收入税
+	stats.TodayProfit = todayRevenue - todayCommission - todayRebate - todayCompanyTax + todayTaxIncome
+	if todayRevenue > 0 {
+		stats.TodayProfitRate = stats.TodayProfit / todayRevenue * 100
+	}
+
+	// 当月利润计算
+	// 当月营收
+	monthRevenue := revenueStats.MonthAmount
+	// 当月佣金
+	monthCommissionBuilder := l.svcCtx.AgentCommissionModel.SelectBuilder().
+		Where("del_state = ? AND status != ? AND create_time >= ? AND create_time < ?", globalkey.DelStateNo, 3, monthStart, monthEnd)
+	monthCommission, err := l.svcCtx.AgentCommissionModel.FindSum(l.ctx, monthCommissionBuilder, "amount")
+	if err != nil {
+		return stats, err
+	}
+	// 当月返利
+	monthRebateBuilder := l.svcCtx.AgentRebateModel.SelectBuilder().
+		Where("del_state = ? AND status != ? AND create_time >= ? AND create_time < ?", globalkey.DelStateNo, 3, monthStart, monthEnd)
+	monthRebate, err := l.svcCtx.AgentRebateModel.FindSum(l.ctx, monthRebateBuilder, "rebate_amount")
+	if err != nil {
+		return stats, err
+	}
+	// 当月公司交税
+	monthCompanyTax := monthRevenue * companyTaxRate
+	// 当月平台收入税
+	monthTaxIncomeBuilder := l.svcCtx.AgentWithdrawalTaxModel.SelectBuilder().
+		Where("del_state = ? AND tax_status = ? AND create_time >= ? AND create_time < ?", globalkey.DelStateNo, 2, monthStart, monthEnd)
+	monthTaxIncome, err := l.svcCtx.AgentWithdrawalTaxModel.FindSum(l.ctx, monthTaxIncomeBuilder, "tax_amount")
+	if err != nil {
+		return stats, err
+	}
+	// 当月利润
+	stats.MonthProfit = monthRevenue - monthCommission - monthRebate - monthCompanyTax + monthTaxIncome
+	if monthRevenue > 0 {
+		stats.MonthProfitRate = stats.MonthProfit / monthRevenue * 100
+	}
+
+	// 总利润计算
+	// 总营收
+	totalRevenue := revenueStats.TotalAmount
+	// 总佣金
+	totalCommissionBuilder := l.svcCtx.AgentCommissionModel.SelectBuilder().
+		Where("del_state = ? AND status != ?", globalkey.DelStateNo, 3)
+	totalCommission, err := l.svcCtx.AgentCommissionModel.FindSum(l.ctx, totalCommissionBuilder, "amount")
+	if err != nil {
+		return stats, err
+	}
+	// 总返利
+	totalRebateBuilder := l.svcCtx.AgentRebateModel.SelectBuilder().
+		Where("del_state = ? AND status != ?", globalkey.DelStateNo, 3)
+	totalRebate, err := l.svcCtx.AgentRebateModel.FindSum(l.ctx, totalRebateBuilder, "rebate_amount")
+	if err != nil {
+		return stats, err
+	}
+	// 总公司交税
+	totalCompanyTax := totalRevenue * companyTaxRate
+	// 总平台收入税
+	totalTaxIncomeBuilder := l.svcCtx.AgentWithdrawalTaxModel.SelectBuilder().
+		Where("del_state = ? AND tax_status = ?", globalkey.DelStateNo, 2)
+	totalTaxIncome, err := l.svcCtx.AgentWithdrawalTaxModel.FindSum(l.ctx, totalTaxIncomeBuilder, "tax_amount")
+	if err != nil {
+		return stats, err
+	}
+	// 总利润
+	stats.TotalProfit = totalRevenue - totalCommission - totalRebate - totalCompanyTax + totalTaxIncome
+	if totalRevenue > 0 {
+		stats.TotalProfitRate = stats.TotalProfit / totalRevenue * 100
+	}
+
+	return stats, nil
+}
+
+// calculateOrderTrend 计算订单趋势（最近7天）
+func (l *AdminGetDashboardStatisticsLogic) calculateOrderTrend(now time.Time, loc *time.Location) ([]types.AdminTrendData, error) {
+	var trend []types.AdminTrendData
+
+	// 计算最近7天的日期
+	for i := 6; i >= 0; i-- {
+		date := now.AddDate(0, 0, -i)
+		dateStart := time.Date(date.Year(), date.Month(), date.Day(), 0, 0, 0, 0, loc)
+		dateEnd := dateStart.AddDate(0, 0, 1)
+
+		// 查询当天的订单数
+		builder := l.svcCtx.OrderModel.SelectBuilder().
+			Where("status = ? AND create_time >= ? AND create_time < ?", "paid", dateStart, dateEnd)
+		count, err := l.svcCtx.OrderModel.FindCount(l.ctx, builder, "id")
+		if err != nil {
+			return nil, err
+		}
+
+		trend = append(trend, types.AdminTrendData{
+			Date:  date.Format("01-02"),
+			Value: float64(count),
+		})
+	}
+
+	return trend, nil
+}
+
+// calculateRevenueTrend 计算营收趋势（最近7天）
+func (l *AdminGetDashboardStatisticsLogic) calculateRevenueTrend(now time.Time, loc *time.Location) ([]types.AdminTrendData, error) {
+	var trend []types.AdminTrendData
+
+	// 计算最近7天的日期
+	for i := 6; i >= 0; i-- {
+		date := now.AddDate(0, 0, -i)
+		dateStart := time.Date(date.Year(), date.Month(), date.Day(), 0, 0, 0, 0, loc)
+		dateEnd := dateStart.AddDate(0, 0, 1)
+
+		// 查询当天的营收
+		builder := l.svcCtx.OrderModel.SelectBuilder().
+			Where("status = ? AND create_time >= ? AND create_time < ?", "paid", dateStart, dateEnd)
+		amount, err := l.svcCtx.OrderModel.FindSum(l.ctx, builder, "amount")
+		if err != nil {
+			return nil, err
+		}
+
+		trend = append(trend, types.AdminTrendData{
+			Date:  date.Format("01-02"),
+			Value: amount,
+		})
+	}
+
+	return trend, nil
+}

app/main/api/internal/logic/admin_feature/admincreatefeaturelogic.go

@@ -34,6 +34,10 @@ func (l *AdminCreateFeatureLogic) AdminCreateFeature(req *types.AdminCreateFeatu
 		ApiId: req.ApiId,
 		Name:  req.Name,
 	}
+	// 设置白名单屏蔽价格
+	if req.WhitelistPrice != nil {
+		data.WhitelistPrice = *req.WhitelistPrice
+	}
 
 	// 2. 数据库操作
 	result, err := l.svcCtx.FeatureModel.Insert(l.ctx, nil, data)

app/main/api/internal/logic/admin_feature/admingetfeaturedetaillogic.go

@@ -35,11 +35,12 @@ func (l *AdminGetFeatureDetailLogic) AdminGetFeatureDetail(req *types.AdminGetFe
 
 	// 2. 构建响应
 	resp = &types.AdminGetFeatureDetailResp{
-		Id:         record.Id,
-		ApiId:      record.ApiId,
-		Name:       record.Name,
-		CreateTime: record.CreateTime.Format("2006-01-02 15:04:05"),
-		UpdateTime: record.UpdateTime.Format("2006-01-02 15:04:05"),
+		Id:            record.Id,
+		ApiId:         record.ApiId,
+		Name:          record.Name,
+		WhitelistPrice: record.WhitelistPrice,
+		CreateTime:    record.CreateTime.Format("2006-01-02 15:04:05"),
+		UpdateTime:    record.UpdateTime.Format("2006-01-02 15:04:05"),
 	}
 
 	return resp, nil

app/main/api/internal/logic/admin_feature/admingetfeaturelistlogic.go

@@ -49,11 +49,12 @@ func (l *AdminGetFeatureListLogic) AdminGetFeatureList(req *types.AdminGetFeatur
 	items := make([]types.FeatureListItem, 0, len(list))
 	for _, item := range list {
 		listItem := types.FeatureListItem{
-			Id:         item.Id,
-			ApiId:      item.ApiId,
-			Name:       item.Name,
-			CreateTime: item.CreateTime.Format("2006-01-02 15:04:05"),
-			UpdateTime: item.UpdateTime.Format("2006-01-02 15:04:05"),
+			Id:            item.Id,
+			ApiId:         item.ApiId,
+			Name:          item.Name,
+			WhitelistPrice: item.WhitelistPrice,
+			CreateTime:    item.CreateTime.Format("2006-01-02 15:04:05"),
+			UpdateTime:    item.UpdateTime.Format("2006-01-02 15:04:05"),
 		}
 		items = append(items, listItem)
 	}

app/main/api/internal/logic/admin_feature/adminupdatefeaturelogic.go

@@ -46,6 +46,9 @@ func (l *AdminUpdateFeatureLogic) AdminUpdateFeature(req *types.AdminUpdateFeatu
 	if req.Name != nil && *req.Name != "" {
 		record.Name = *req.Name
 	}
+	if req.WhitelistPrice != nil {
+		record.WhitelistPrice = *req.WhitelistPrice
+	}
 
 	// 4. 执行更新操作
 	err = l.svcCtx.FeatureModel.UpdateWithVersion(l.ctx, nil, record)

app/main/api/internal/logic/admin_order/admingetorderdetaillogic.go

@@ -6,7 +6,6 @@ import (
 	"ycc-server/app/main/api/internal/svc"
 	"ycc-server/app/main/api/internal/types"
 	"ycc-server/app/main/model"
-	"ycc-server/common/globalkey"
 	"ycc-server/common/xerr"
 
 	"github.com/pkg/errors"
@@ -84,7 +83,6 @@ func (l *AdminGetOrderDetailLogic) AdminGetOrderDetail(req *types.AdminGetOrderD
 		// 查询清理日志
 		cleanupBuilder := l.svcCtx.QueryCleanupDetailModel.SelectBuilder().
 			Where("order_id = ?", order.Id).
-			Where("del_state = ?", globalkey.DelStateNo).
 			OrderBy("create_time DESC").
 			Limit(1)
 		cleanupDetails, err := l.svcCtx.QueryCleanupDetailModel.FindAll(l.ctx, cleanupBuilder, "")

app/main/api/internal/logic/admin_order/admingetorderlistlogic.go

@@ -7,7 +7,6 @@ import (
 	"ycc-server/app/main/api/internal/svc"
 	"ycc-server/app/main/api/internal/types"
 	"ycc-server/app/main/model"
-	"ycc-server/common/globalkey"
 	"ycc-server/common/xerr"
 
 	"github.com/Masterminds/squirrel"
@@ -139,7 +138,6 @@ func (l *AdminGetOrderListLogic) AdminGetOrderList(req *types.AdminGetOrderListR
 			// 查询清理日志
 			cleanupBuilder := l.svcCtx.QueryCleanupDetailModel.SelectBuilder().
 				Where(squirrel.Eq{"order_id": notFoundOrderIds}).
-				Where("del_state = ?", globalkey.DelStateNo).
 				OrderBy("create_time DESC")
 			cleanupDetails, err := l.svcCtx.QueryCleanupDetailModel.FindAll(l.ctx, cleanupBuilder, "")
 			if err != nil && !errors.Is(err, model.ErrNotFound) {

app/main/api/internal/logic/admin_order/adminrefundorderlogic.go

@@ -1,27 +1,30 @@
 package admin_order
 
 import (
-    "context"
-    "database/sql"
-    "fmt"
-    "time"
+	"context"
+	"database/sql"
+	"fmt"
+	"time"
 
-    "ycc-server/app/main/api/internal/svc"
-    "ycc-server/app/main/api/internal/types"
-    "ycc-server/app/main/model"
-    "ycc-server/common/xerr"
+	"ycc-server/app/main/api/internal/svc"
+	"ycc-server/app/main/api/internal/types"
+	"ycc-server/app/main/model"
+	"ycc-server/common/xerr"
 
-    "github.com/pkg/errors"
-    "github.com/zeromicro/go-zero/core/logx"
-    "github.com/zeromicro/go-zero/core/stores/sqlx"
-    "github.com/google/uuid"
+	"github.com/google/uuid"
+	"github.com/pkg/errors"
+	"github.com/smartwalle/alipay/v3"
+	"github.com/zeromicro/go-zero/core/logx"
+	"github.com/zeromicro/go-zero/core/stores/sqlx"
 )
 
 const (
-	PaymentPlatformAlipay = "alipay"
-	PaymentPlatformWechat = "wechat"
-	OrderStatusPaid       = "paid"
-	RefundNoPrefix        = "refund-"
+	PaymentPlatformAlipay    = "alipay"
+	PaymentPlatformWechat    = "wechat"
+	PaymentPlatformTest      = "test"
+	PaymentPlatformTestEmpty = "test_empty"
+	OrderStatusPaid          = "paid"
+	RefundNoPrefix           = "refund-"
 )
 
 type AdminRefundOrderLogic struct {
@@ -44,6 +47,11 @@ func (l *AdminRefundOrderLogic) AdminRefundOrder(req *types.AdminRefundOrderReq)
 		return nil, err
 	}
 
+	// 检查是否为测试支付平台（test 或 test_empty），如果是则模拟退款成功
+	if order.PaymentPlatform == PaymentPlatformTest || order.PaymentPlatform == PaymentPlatformTestEmpty {
+		return l.handleTestRefund(order, req)
+	}
+
 	// 根据支付平台处理退款
 	switch order.PaymentPlatform {
 	case PaymentPlatformAlipay:
@@ -75,29 +83,39 @@ func (l *AdminRefundOrderLogic) getAndValidateOrder(orderId string, refundAmount
 	return order, nil
 }
 
+// handleTestRefund 处理测试支付平台退款（模拟退款成功）
+func (l *AdminRefundOrderLogic) handleTestRefund(order *model.Order, req *types.AdminRefundOrderReq) (*types.AdminRefundOrderResp, error) {
+	refundNo := l.generateRefundNo(order.OrderNo)
+	// 创建模拟的平台退款ID
+	platformRefundId := fmt.Sprintf("MOCK_REFUND_%s_%d", order.OrderNo, time.Now().Unix())
+
+	logx.Infof("测试支付平台模拟退款：订单 %s，退款金额 %.2f，跳过实际退款接口调用", order.OrderNo, req.RefundAmount)
+
+	// 直接标记为退款成功
+	err := l.createRefundRecordAndUpdateOrder(order, req, refundNo, platformRefundId, model.OrderStatusRefunded, model.OrderRefundStatusSuccess)
+	if err != nil {
+		return nil, err
+	}
+
+	return &types.AdminRefundOrderResp{
+		Status:   model.OrderStatusRefunded,
+		RefundNo: refundNo,
+		Amount:   req.RefundAmount,
+	}, nil
+}
+
 // handleAlipayRefund 处理支付宝退款
 func (l *AdminRefundOrderLogic) handleAlipayRefund(order *model.Order, req *types.AdminRefundOrderReq) (*types.AdminRefundOrderResp, error) {
+	refundNo := l.generateRefundNo(order.OrderNo)
+
 	// 调用支付宝退款接口
+	var refundResp *alipay.TradeRefundRsp
 	refundResp, err := l.svcCtx.AlipayService.AliRefund(l.ctx, order.OrderNo, req.RefundAmount)
 	if err != nil {
 		return nil, errors.Wrapf(xerr.NewErrCode(xerr.SERVER_COMMON_ERROR), "AdminRefundOrder, 支付宝退款失败 err: %v", err)
 	}
 
-	refundNo := l.generateRefundNo(order.OrderNo)
-
-	if refundResp.IsSuccess() {
-		// 支付宝退款成功，创建成功记录
-		err = l.createRefundRecordAndUpdateOrder(order, req, refundNo, refundResp.TradeNo, model.OrderStatusRefunded, model.OrderRefundStatusSuccess)
-		if err != nil {
-			return nil, err
-		}
-
-		return &types.AdminRefundOrderResp{
-			Status:   model.OrderStatusRefunded,
-			RefundNo: refundNo,
-			Amount:   req.RefundAmount,
-		}, nil
-	} else {
+	if !refundResp.IsSuccess() {
 		// 支付宝退款失败，创建失败记录但不更新订单状态
 		err = l.createRefundRecordOnly(order, req, refundNo, refundResp.TradeNo, model.OrderRefundStatusFailed)
 		if err != nil {
@@ -105,10 +123,24 @@ func (l *AdminRefundOrderLogic) handleAlipayRefund(order *model.Order, req *type
 		}
 		return nil, errors.Wrapf(xerr.NewErrMsg(fmt.Sprintf("退款失败: %v", refundResp.Msg)), "AdminRefundOrder, 支付宝退款失败")
 	}
+
+	// 支付宝退款成功，创建成功记录
+	err = l.createRefundRecordAndUpdateOrder(order, req, refundNo, refundResp.TradeNo, model.OrderStatusRefunded, model.OrderRefundStatusSuccess)
+	if err != nil {
+		return nil, err
+	}
+
+	return &types.AdminRefundOrderResp{
+		Status:   model.OrderStatusRefunded,
+		RefundNo: refundNo,
+		Amount:   req.RefundAmount,
+	}, nil
 }
 
 // handleWechatRefund 处理微信退款
 func (l *AdminRefundOrderLogic) handleWechatRefund(order *model.Order, req *types.AdminRefundOrderReq) (*types.AdminRefundOrderResp, error) {
+	refundNo := l.generateRefundNo(order.OrderNo)
+
 	// 调用微信退款接口
 	err := l.svcCtx.WechatPayService.WeChatRefund(l.ctx, order.OrderNo, req.RefundAmount, order.Amount)
 	if err != nil {
@@ -116,7 +148,6 @@ func (l *AdminRefundOrderLogic) handleWechatRefund(order *model.Order, req *type
 	}
 
 	// 微信退款是异步的，创建pending状态的退款记录
-	refundNo := l.generateRefundNo(order.OrderNo)
 	err = l.createRefundRecordAndUpdateOrder(order, req, refundNo, "", model.OrderStatusRefunding, model.OrderRefundStatusPending)
 	if err != nil {
 		return nil, err
@@ -131,20 +162,20 @@ func (l *AdminRefundOrderLogic) handleWechatRefund(order *model.Order, req *type
 
 // createRefundRecordAndUpdateOrder 创建退款记录并更新订单状态
 func (l *AdminRefundOrderLogic) createRefundRecordAndUpdateOrder(order *model.Order, req *types.AdminRefundOrderReq, refundNo, platformRefundId, orderStatus, refundStatus string) error {
-	return l.svcCtx.OrderModel.Trans(l.ctx, func(ctx context.Context, session sqlx.Session) error {
+	err := l.svcCtx.OrderModel.Trans(l.ctx, func(ctx context.Context, session sqlx.Session) error {
 		// 创建退款记录
-    refund := &model.OrderRefund{
-        Id:               uuid.NewString(),
-        RefundNo:         refundNo,
-        PlatformRefundId: l.createNullString(platformRefundId),
-        OrderId:          order.Id,
-        UserId:           order.UserId,
-        ProductId:        order.ProductId,
-        RefundAmount:     req.RefundAmount,
-        RefundReason:     l.createNullString(req.RefundReason),
-        Status:           refundStatus, // 使用传入的状态，不再硬编码
-        RefundTime:       sql.NullTime{Time: time.Now(), Valid: true},
-    }
+		refund := &model.OrderRefund{
+			Id:               uuid.NewString(),
+			RefundNo:         refundNo,
+			PlatformRefundId: l.createNullString(platformRefundId),
+			OrderId:          order.Id,
+			UserId:           order.UserId,
+			ProductId:        order.ProductId,
+			RefundAmount:     req.RefundAmount,
+			RefundReason:     l.createNullString(req.RefundReason),
+			Status:           refundStatus, // 使用传入的状态，不再硬编码
+			RefundTime:       sql.NullTime{Time: time.Now(), Valid: true},
+		}
 
 		if _, err := l.svcCtx.OrderRefundModel.Insert(ctx, session, refund); err != nil {
 			return fmt.Errorf("创建退款记录失败: %v", err)
@@ -158,22 +189,43 @@ func (l *AdminRefundOrderLogic) createRefundRecordAndUpdateOrder(order *model.Or
 
 		return nil
 	})
+
+	if err != nil {
+		return err
+	}
+
+	// 退款成功后，检查并处理代理订单（在事务外执行，避免影响退款流程）
+	if refundStatus == model.OrderRefundStatusSuccess {
+		// 检查代理订单是否已处理
+		agentOrder, err := l.svcCtx.AgentOrderModel.FindOneByOrderId(l.ctx, order.Id)
+		if err == nil && agentOrder != nil && agentOrder.ProcessStatus == 1 {
+			// 代理订单已处理，需要撤销收益
+			if cancelErr := l.svcCtx.AgentService.CancelAgentCommission(l.ctx, order.Id); cancelErr != nil {
+				logx.Errorf("撤销代理收益失败，订单ID: %s, 错误: %v", order.Id, cancelErr)
+				// 不阻断退款流程，只记录日志（退款已成功，不能回滚）
+			} else {
+				logx.Infof("成功撤销代理收益，订单ID: %s", order.Id)
+			}
+		}
+	}
+
+	return nil
 }
 
 // createRefundRecordOnly 仅创建退款记录，不更新订单状态（用于退款失败的情况）
 func (l *AdminRefundOrderLogic) createRefundRecordOnly(order *model.Order, req *types.AdminRefundOrderReq, refundNo, platformRefundId, refundStatus string) error {
-    refund := &model.OrderRefund{
-        Id:               uuid.NewString(),
-        RefundNo:         refundNo,
-        PlatformRefundId: l.createNullString(platformRefundId),
-        OrderId:          order.Id,
-        UserId:           order.UserId,
-        ProductId:        order.ProductId,
-        RefundAmount:     req.RefundAmount,
-        RefundReason:     l.createNullString(req.RefundReason),
-        Status:           refundStatus,
-        RefundTime:       sql.NullTime{Time: time.Now(), Valid: true},
-    }
+	refund := &model.OrderRefund{
+		Id:               uuid.NewString(),
+		RefundNo:         refundNo,
+		PlatformRefundId: l.createNullString(platformRefundId),
+		OrderId:          order.Id,
+		UserId:           order.UserId,
+		ProductId:        order.ProductId,
+		RefundAmount:     req.RefundAmount,
+		RefundReason:     l.createNullString(req.RefundReason),
+		Status:           refundStatus,
+		RefundTime:       sql.NullTime{Time: time.Now(), Valid: true},
+	}
 
 	_, err := l.svcCtx.OrderRefundModel.Insert(l.ctx, nil, refund)
 	if err != nil {

app/main/api/internal/logic/admin_query/admingetquerycleanupconfiglistlogic.go

@@ -4,7 +4,6 @@ import (
 	"context"
 	"ycc-server/app/main/api/internal/svc"
 	"ycc-server/app/main/api/internal/types"
-	"ycc-server/common/globalkey"
 	"ycc-server/common/xerr"
 
 	"github.com/pkg/errors"
@@ -27,8 +26,7 @@ func NewAdminGetQueryCleanupConfigListLogic(ctx context.Context, svcCtx *svc.Ser
 
 func (l *AdminGetQueryCleanupConfigListLogic) AdminGetQueryCleanupConfigList(req *types.AdminGetQueryCleanupConfigListReq) (resp *types.AdminGetQueryCleanupConfigListResp, err error) {
 	// 构建查询条件
-	builder := l.svcCtx.QueryCleanupConfigModel.SelectBuilder().
-		Where("del_state = ?", globalkey.DelStateNo)
+	builder := l.svcCtx.QueryCleanupConfigModel.SelectBuilder()
 
 	if req.Status > 0 {
 		builder = builder.Where("status = ?", req.Status)

app/main/api/internal/logic/admin_query/admingetquerycleanupdetaillistlogic.go

@@ -6,7 +6,6 @@ import (
 	"ycc-server/app/main/api/internal/svc"
 	"ycc-server/app/main/api/internal/types"
 	"ycc-server/app/main/model"
-	"ycc-server/common/globalkey"
 	"ycc-server/common/xerr"
 
 	"github.com/pkg/errors"
@@ -40,8 +39,7 @@ func (l *AdminGetQueryCleanupDetailListLogic) AdminGetQueryCleanupDetailList(req
 
 	// 2. 构建查询条件
 	builder := l.svcCtx.QueryCleanupDetailModel.SelectBuilder().
-		Where("cleanup_log_id = ?", req.LogId).
-		Where("del_state = ?", globalkey.DelStateNo)
+		Where("cleanup_log_id = ?", req.LogId)
 
 	// 3. 并发获取总数和列表
 	var total int64

app/main/api/internal/logic/admin_query/admingetquerycleanuploglistlogic.go

@@ -5,7 +5,6 @@ import (
 	"ycc-server/app/main/api/internal/svc"
 	"ycc-server/app/main/api/internal/types"
 	"ycc-server/app/main/model"
-	"ycc-server/common/globalkey"
 	"ycc-server/common/xerr"
 
 	"github.com/pkg/errors"
@@ -29,8 +28,7 @@ func NewAdminGetQueryCleanupLogListLogic(ctx context.Context, svcCtx *svc.Servic
 
 func (l *AdminGetQueryCleanupLogListLogic) AdminGetQueryCleanupLogList(req *types.AdminGetQueryCleanupLogListReq) (resp *types.AdminGetQueryCleanupLogListResp, err error) {
 	// 构建查询条件
-	builder := l.svcCtx.QueryCleanupLogModel.SelectBuilder().
-		Where("del_state = ?", globalkey.DelStateNo)
+	builder := l.svcCtx.QueryCleanupLogModel.SelectBuilder()
 
 	if req.Status > 0 {
 		builder = builder.Where("status = ?", req.Status)

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) {

app/main/api/internal/logic/pay/alipaycallbacklogic.go

@@ -45,6 +45,9 @@ func (l *AlipayCallbackLogic) AlipayCallback(w http.ResponseWriter, r *http.Requ
 	} else if strings.HasPrefix(orderNo, "U_") {
 		// 代理升级订单处理
 		return l.handleAgentUpgradeOrderPayment(w, notification)
+	} else if strings.HasPrefix(orderNo, "W_") {
+		// 白名单下架订单处理
+		return l.handleWhitelistOrderPayment(w, notification)
 	} else if strings.HasPrefix(orderNo, "A_") {
 		// 旧系统会员充值订单（已废弃，新系统使用升级功能）
 		// return l.handleAgentVipOrderPayment(w, notification)
@@ -110,6 +113,96 @@ func (l *AlipayCallbackLogic) handleQueryOrderPayment(w http.ResponseWriter, not
 	return nil
 }
 
+// 处理白名单下架订单支付
+func (l *AlipayCallbackLogic) handleWhitelistOrderPayment(w http.ResponseWriter, notification *alipay.Notification) error {
+	orderNo := notification.OutTradeNo
+
+	// 1. 查找订单
+	order, findOrderErr := l.svcCtx.OrderModel.FindOneByOrderNo(l.ctx, orderNo)
+	if findOrderErr != nil {
+		logx.Errorf("支付宝白名单支付回调，查找订单失败: %+v", findOrderErr)
+		alipay.ACKNotification(w)
+		return nil
+	}
+
+	// 2. 验证金额
+	amount := lzUtils.ToAlipayAmount(order.Amount)
+	user, err := l.svcCtx.UserModel.FindOne(l.ctx, order.UserId)
+	if err == nil && user.Inside != 1 {
+		if amount != notification.TotalAmount {
+			logx.Errorf("支付宝白名单支付回调，金额不一致，订单号: %s", orderNo)
+			alipay.ACKNotification(w)
+			return nil
+		}
+	}
+
+	// 3. 检查订单状态
+	if order.Status != "pending" {
+		alipay.ACKNotification(w)
+		return nil
+	}
+
+	// 4. 查找白名单订单
+	whitelistOrder, findWhitelistErr := l.svcCtx.WhitelistOrderModel.FindOneByOrderNo(l.ctx, orderNo)
+	if findWhitelistErr != nil {
+		logx.Errorf("支付宝白名单支付回调，查找白名单订单失败，订单号: %s, 错误: %+v", orderNo, findWhitelistErr)
+		alipay.ACKNotification(w)
+		return nil
+	}
+	if whitelistOrder.Status != 1 {
+		// 白名单订单状态不是待支付，直接返回成功
+		alipay.ACKNotification(w)
+		return nil
+	}
+
+	// 5. 处理支付状态
+	switch notification.TradeStatus {
+	case alipay.TradeStatusSuccess:
+		order.Status = "paid"
+		order.PayTime = lzUtils.TimeToNullTime(time.Now())
+		order.PlatformOrderId = lzUtils.StringToNullString(notification.TradeNo)
+		whitelistOrder.Status = 2 // 已支付
+		whitelistOrder.PayTime = lzUtils.TimeToNullTime(time.Now())
+	case alipay.TradeStatusClosed:
+		order.Status = "closed"
+		order.CloseTime = lzUtils.TimeToNullTime(time.Now())
+		whitelistOrder.Status = 3 // 已取消
+	default:
+		alipay.ACKNotification(w)
+		return nil
+	}
+
+	// 6. 更新订单和白名单订单 + 创建白名单记录并删除报告数据
+	err = l.svcCtx.WhitelistOrderModel.Trans(l.ctx, func(ctx context.Context, session sqlx.Session) error {
+		// 6.1 更新订单状态
+		if updateErr := l.svcCtx.OrderModel.UpdateWithVersion(ctx, session, order); updateErr != nil {
+			return errors.Wrapf(updateErr, "支付宝白名单支付回调，更新订单状态失败")
+		}
+
+		// 6.2 更新白名单订单状态
+		if updateErr := l.svcCtx.WhitelistOrderModel.UpdateWithVersion(ctx, session, whitelistOrder); updateErr != nil {
+			return errors.Wrapf(updateErr, "支付宝白名单支付回调，更新白名单订单状态失败")
+		}
+
+		// 6.3 如果支付成功，调用 WhitelistService 处理白名单和报告数据
+		if whitelistOrder.Status == 2 {
+			if processErr := l.svcCtx.WhitelistService.ProcessPaidWhitelistOrder(ctx, session, order, whitelistOrder); processErr != nil {
+				return errors.Wrapf(processErr, "支付宝白名单支付回调，处理白名单订单失败")
+			}
+		}
+
+		return nil
+	})
+	if err != nil {
+		logx.Errorf("支付宝白名单支付回调，事务处理失败: %+v", err)
+		alipay.ACKNotification(w)
+		return nil
+	}
+
+	alipay.ACKNotification(w)
+	return nil
+}
+
 // 处理代理升级订单支付
 func (l *AlipayCallbackLogic) handleAgentUpgradeOrderPayment(w http.ResponseWriter, notification *alipay.Notification) error {
 	orderNo := notification.OutTradeNo

app/main/api/internal/logic/pay/alipayfromlogic.go

@@ -0,0 +1,240 @@
+package pay
+
+import (
+	"context"
+	"encoding/json"
+	"net/http"
+	"ycc-server/app/main/api/internal/svc"
+	"ycc-server/app/main/model"
+	"ycc-server/pkg/lzkit/lzUtils"
+
+	"github.com/google/uuid"
+	"github.com/smartwalle/alipay/v3"
+	"github.com/zeromicro/go-zero/core/logx"
+)
+
+type AlipayFromLogic struct {
+	logx.Logger
+	ctx    context.Context
+	svcCtx *svc.ServiceContext
+}
+
+func NewAlipayFromLogic(ctx context.Context, svcCtx *svc.ServiceContext) *AlipayFromLogic {
+	return &AlipayFromLogic{
+		Logger: logx.WithContext(ctx),
+		ctx:    ctx,
+		svcCtx: svcCtx,
+	}
+}
+
+// TradeComplainContent 交易投诉通知的 biz_content 内容
+type TradeComplainContent struct {
+	ComplainEventID     string `json:"complain_event_id"`      // 支付宝侧投诉单号
+	ComplainNotifyAppID string `json:"complain_notify_app_id"` // 投诉消息通知的应用ID
+
+	Status string `json:"status"` // 投诉单状态，可能的枚举值如下（用Go语法注释）:
+	/*
+		MERCHANT_PROCESSING   // 待处理
+		MERCHANT_FEEDBACKED   // 已处理
+		FINISHED              // 投诉完结
+		CANCELLED             // 投诉关闭
+		PLATFORM_PROCESSING   // 客服处理中
+		PLATFORM_FINISH       // 客服处理完结
+		CLOSED                // 投诉关闭
+	*/
+	BizType string `json:"biz_type"` // 业务类型
+	OrderID string `json:"order_id"` // 订单ID
+}
+
+// SecurityRiskComplaintsNotifyContent 安全风险投诉商户通知的 biz_content 内容
+type SecurityRiskComplaintsNotifyContent struct {
+	ComplaintID string `json:"complaint_id"` // 投诉ID
+	MessageType string `json:"message_type"` // 消息类型，可能的枚举值如下（用Go语法注释）:
+	/*
+		USER_REPLY        // 用户回复
+		MERCHANT_REPLY    // 商户回复
+		SYSTEM_NOTIFY     // 系统通知
+	*/
+	ReplyContent string `json:"reply_content"` // 回复内容
+	ReplyTime    string `json:"reply_time"`    // 回复时间，格式：YYYY-MM-DD HH:mm:ss
+}
+
+func (l *AlipayFromLogic) AlipayFrom(w http.ResponseWriter, r *http.Request) error {
+	// 1. 解析表单
+	err := r.ParseForm()
+	if err != nil {
+		logx.Errorf("支付宝from消息回调，解析表单失败: %v", err)
+		// 保存失败记录
+		l.saveCallbackRecord(r, "", "", "failed", "解析表单失败: "+err.Error())
+		return nil
+	}
+
+	// 获取基本信息
+	appID := r.Form.Get("app_id")
+	msgMethod := r.Form.Get("msg_method")
+
+	// 2. 验签
+	client := l.svcCtx.AlipayService.AlipayClient
+	if err := client.VerifySign(r.Form); err != nil {
+		logx.Errorf("支付宝from消息回调，验签失败: %v", err)
+		// 保存失败记录
+		l.saveCallbackRecord(r, appID, msgMethod, "failed", "验签失败: "+err.Error())
+		return nil
+	}
+
+	// 3. 验证 app_id
+	if appID == "" {
+		logx.Errorf("支付宝from消息回调，app_id为空")
+		// 保存失败记录
+		l.saveCallbackRecord(r, appID, msgMethod, "failed", "app_id为空")
+		return nil
+	}
+	if appID != l.svcCtx.Config.Alipay.AppID {
+		logx.Errorf("支付宝from消息回调，app_id不匹配，期望: %s, 实际: %s", l.svcCtx.Config.Alipay.AppID, appID)
+		// 保存失败记录
+		l.saveCallbackRecord(r, appID, msgMethod, "failed", "app_id不匹配")
+		return nil
+	}
+
+	// 4. 获取 msg_method 判断业务类型
+	if msgMethod == "" {
+		logx.Errorf("支付宝from消息回调，msg_method为空")
+		// 保存失败记录
+		l.saveCallbackRecord(r, appID, msgMethod, "failed", "msg_method为空")
+		return nil
+	}
+
+	// 5. 先保存回调记录（pending状态）
+	callbackID := l.saveCallbackRecord(r, appID, msgMethod, "pending", "")
+	if callbackID == "" {
+		logx.Errorf("支付宝from消息回调，保存回调记录失败")
+		// 即使保存失败也继续处理，避免影响业务
+	}
+
+	// 6. 根据 msg_method 路由到对应的处理函数
+	var handleErr error
+	switch msgMethod {
+	case "alipay.merchant.tradecomplain.changed":
+		// 交易投诉通知回调
+		handleErr = l.handleTradeComplainChanged(w, r, callbackID)
+	case "alipay.security.risk.complaints.merchants.notify":
+		// 安全风险投诉商户通知回调
+		handleErr = l.handleSecurityRiskComplaintsNotify(w, r, callbackID)
+	default:
+		logx.Infof("支付宝from消息回调，未处理的msg_method: %s", msgMethod)
+		// 更新为已处理（未处理的也标记为已处理）
+		if callbackID != "" {
+			l.updateCallbackStatus(callbackID, "processed", "")
+		}
+		alipay.ACKNotification(w)
+		return nil
+	}
+
+	// 7. 根据处理结果更新状态
+	if callbackID != "" {
+		if handleErr != nil {
+			l.updateCallbackStatus(callbackID, "failed", handleErr.Error())
+		} else {
+			l.updateCallbackStatus(callbackID, "processed", "")
+		}
+	}
+
+	return handleErr
+}
+
+// saveCallbackRecord 保存回调记录到数据库
+func (l *AlipayFromLogic) saveCallbackRecord(r *http.Request, appID, msgMethod, status, errorMsg string) string {
+	callback := &model.AlipayFromCallback{
+		Id:           uuid.NewString(),
+		MsgMethod:    msgMethod,
+		AppId:        appID,
+		NotifyId:     lzUtils.StringToNullString(r.Form.Get("notify_id")),
+		BizContent:   r.Form.Get("biz_content"),
+		Status:       status,
+		ErrorMessage: lzUtils.StringToNullString(errorMsg),
+	}
+
+	_, err := l.svcCtx.AlipayFromCallbackModel.Insert(l.ctx, nil, callback)
+	if err != nil {
+		logx.Errorf("保存支付宝from回调记录失败: %v", err)
+		return ""
+	}
+
+	return callback.Id
+}
+
+// updateCallbackStatus 更新回调记录状态
+func (l *AlipayFromLogic) updateCallbackStatus(callbackID, status, errorMsg string) {
+	callback, err := l.svcCtx.AlipayFromCallbackModel.FindOne(l.ctx, callbackID)
+	if err != nil {
+		logx.Errorf("查找支付宝from回调记录失败: %v", err)
+		return
+	}
+
+	callback.Status = status
+	if errorMsg != "" {
+		callback.ErrorMessage = lzUtils.StringToNullString(errorMsg)
+	}
+
+	err = l.svcCtx.AlipayFromCallbackModel.UpdateWithVersion(l.ctx, nil, callback)
+	if err != nil {
+		logx.Errorf("更新支付宝from回调记录状态失败: %v", err)
+	}
+}
+
+// handleTradeComplainChanged 处理交易投诉通知回调
+func (l *AlipayFromLogic) handleTradeComplainChanged(w http.ResponseWriter, r *http.Request, callbackID string) error {
+	// 获取 biz_content
+	bizContent := r.Form.Get("biz_content")
+	if bizContent == "" {
+		logx.Errorf("支付宝交易投诉通知回调，biz_content为空")
+		return nil
+	}
+
+	// 解析 biz_content JSON
+	var content TradeComplainContent
+	if err := json.Unmarshal([]byte(bizContent), &content); err != nil {
+		logx.Errorf("支付宝交易投诉通知回调，解析biz_content失败: %v, content: %s", err, bizContent)
+		return nil
+	}
+
+	// 记录日志
+	logx.Infof("支付宝交易投诉通知回调，投诉事件ID: %s, 订单ID: %s, 状态: %s, 业务类型: %s",
+		content.ComplainEventID, content.OrderID, content.Status, content.BizType)
+
+	// TODO: 后续在这里添加具体的业务处理逻辑
+	// 例如：根据订单ID查找订单，更新订单状态，发送通知等
+
+	alipay.ACKNotification(w)
+	return nil
+}
+
+// handleSecurityRiskComplaintsNotify 处理安全风险投诉商户通知回调
+func (l *AlipayFromLogic) handleSecurityRiskComplaintsNotify(w http.ResponseWriter, r *http.Request, callbackID string) error {
+	// 获取 biz_content
+	bizContent := r.Form.Get("biz_content")
+	if bizContent == "" {
+		logx.Errorf("支付宝安全风险投诉商户通知回调，biz_content为空")
+		return nil
+	}
+
+	// 解析 biz_content JSON
+	var content SecurityRiskComplaintsNotifyContent
+	if err := json.Unmarshal([]byte(bizContent), &content); err != nil {
+		logx.Errorf("支付宝安全风险投诉商户通知回调，解析biz_content失败: %v, content: %s", err, bizContent)
+		return nil
+	}
+
+	// 记录日志
+	logx.Infof("支付宝安全风险投诉商户通知回调，投诉ID: %s, 消息类型: %s, 回复内容: %s, 回复时间: %s",
+		content.ComplaintID, content.MessageType, content.ReplyContent, content.ReplyTime)
+
+	// 根据投诉ID查询详情并更新投诉记录
+	if err := l.svcCtx.AlipayComplaintService.QueryComplaintByTaskId(l.ctx, content.ComplaintID); err != nil {
+		logx.Errorf("查询并更新投诉记录失败, complaint_id: %s, error: %v", content.ComplaintID, err)
+		// 即使失败也返回成功，避免支付宝重复通知
+	}
+
+	alipay.ACKNotification(w)
+	return nil
+}

app/main/api/internal/logic/pay/paymentchecklogic.go

@@ -38,7 +38,19 @@ func (l *PaymentCheckLogic) PaymentCheck(req *types.PaymentCheckReq) (resp *type
 			Status: order.Status,
 		}, nil
 	}
-	
+
+	if strings.HasPrefix(req.OrderNo, "W_") {
+		// 白名单订单
+		order, err := l.svcCtx.OrderModel.FindOneByOrderNo(l.ctx, req.OrderNo)
+		if err != nil {
+			return nil, errors.Wrapf(xerr.NewErrCode(xerr.DB_ERROR), "查询白名单订单失败: %v", err)
+		}
+		return &types.PaymentCheckResp{
+			Type:   "whitelist",
+			Status: order.Status,
+		}, nil
+	}
+
 	// 查询订单（包括代理订单）
 	order, err := l.svcCtx.OrderModel.FindOneByOrderNo(l.ctx, req.OrderNo)
 	if err != nil {

app/main/api/internal/logic/pay/paymentlogic.go

@@ -72,6 +72,11 @@ func (l *PaymentLogic) Payment(req *types.PaymentReq) (resp *types.PaymentResp,
 			if err != nil {
 				return err
 			}
+		case "whitelist":
+			paymentTypeResp, err = l.WhitelistOrderPayment(req, session)
+			if err != nil {
+				return err
+			}
 		}
 
 		// 开发环境测试支付模式：跳过实际支付流程
@@ -182,6 +187,37 @@ func (l *PaymentLogic) Payment(req *types.PaymentReq) (resp *types.PaymentResp,
 				} else {
 					logx.Infof("开发测试模式，代理升级成功，订单号: %s, 代理ID: %s", paymentTypeResp.outTradeNo, upgradeRecord.AgentId)
 				}
+			} else if strings.HasPrefix(paymentTypeResp.outTradeNo, "W_") {
+				// 白名单订单：更新白名单订单状态并处理白名单记录
+				whitelistOrder, findWhitelistErr := l.svcCtx.WhitelistOrderModel.FindOneByOrderNo(context.Background(), paymentTypeResp.outTradeNo)
+				if findWhitelistErr != nil {
+					logx.Errorf("开发测试模式，查找白名单订单失败，订单号: %s, 错误: %+v", paymentTypeResp.outTradeNo, findWhitelistErr)
+					return
+				}
+
+				// 更新白名单订单状态为已支付并处理白名单记录
+				err := l.svcCtx.WhitelistOrderModel.Trans(context.Background(), func(transCtx context.Context, session sqlx.Session) error {
+					// 更新白名单订单状态为已支付
+					whitelistOrder.Status = 2 // 已支付
+					now := time.Now()
+					whitelistOrder.PayTime = sql.NullTime{Time: now, Valid: true}
+					if updateErr := l.svcCtx.WhitelistOrderModel.UpdateWithVersion(transCtx, session, whitelistOrder); updateErr != nil {
+						return errors.Wrapf(updateErr, "更新白名单订单状态失败")
+					}
+
+					// 调用 WhitelistService 处理白名单记录
+					if processErr := l.svcCtx.WhitelistService.ProcessPaidWhitelistOrder(transCtx, session, order, whitelistOrder); processErr != nil {
+						return errors.Wrapf(processErr, "处理白名单订单失败")
+					}
+
+					return nil
+				})
+
+				if err != nil {
+					logx.Errorf("开发测试模式，处理白名单订单失败，订单号: %s, 错误: %+v", paymentTypeResp.outTradeNo, err)
+				} else {
+					logx.Infof("开发测试模式，白名单订单支付成功，订单号: %s", paymentTypeResp.outTradeNo)
+				}
 			} else {
 				// 查询订单：发送支付成功通知任务，触发后续流程（生成报告和代理处理）
 				if sendErr := l.svcCtx.AsynqService.SendQueryTask(finalOrderID); sendErr != nil {
@@ -202,6 +238,181 @@ func (l *PaymentLogic) Payment(req *types.PaymentReq) (resp *types.PaymentResp,
 	}
 }
 
+// WhitelistOrderPayment 白名单下架支付订单
+// PaymentReq.Id 支持两种格式：
+// 1. "{idCard}|{featureApiId}" - 单个模块下架（创建新订单）
+// 2. 订单号（以 W_ 开头） - 批量订单支付（使用已存在的订单）
+func (l *PaymentLogic) WhitelistOrderPayment(req *types.PaymentReq, session sqlx.Session) (resp *PaymentTypeResp, err error) {
+	userID, err := ctxdata.GetUidFromCtx(l.ctx)
+	if err != nil {
+		return nil, errors.Wrapf(xerr.NewErrCode(xerr.SERVER_COMMON_ERROR), "生成白名单订单, 获取用户信息失败, %v", err)
+	}
+
+	// 判断是订单号还是 "{idCard}|{featureApiId}" 格式
+	var whitelistOrder *model.WhitelistOrder
+	var orderNo string
+	var amount float64
+	var description string
+
+	if strings.HasPrefix(req.Id, "W_") {
+		// 格式2：订单号，使用已存在的批量订单
+		orderNo = req.Id
+		whitelistOrder, err = l.svcCtx.WhitelistOrderModel.FindOneByOrderNo(l.ctx, orderNo)
+		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 whitelistOrder.Status != 1 {
+			return nil, errors.Wrapf(xerr.NewErrMsg("订单状态不正确，无法支付"), "")
+		}
+		if whitelistOrder.UserId != userID {
+			return nil, errors.Wrapf(xerr.NewErrMsg("无权支付此订单"), "")
+		}
+
+		amount = whitelistOrder.TotalAmount
+		description = "模块屏蔽（批量）"
+
+		// 获取用户信息（用于内部用户测试金额）
+		user, err := l.svcCtx.UserModel.FindOne(l.ctx, userID)
+		if err != nil {
+			return nil, errors.Wrapf(xerr.NewErrCode(xerr.DB_ERROR), "获取用户信息失败: %v", err)
+		}
+		if user.Inside == 1 {
+			amount = 0.01
+		}
+
+		// 检查是否已存在支付订单（Order表）
+		existingOrder, findErr := l.svcCtx.OrderModel.FindOneByOrderNo(l.ctx, orderNo)
+		if findErr == nil && existingOrder != nil {
+			// 已存在支付订单，直接使用
+			return &PaymentTypeResp{
+				amount:      amount,
+				outTradeNo:  orderNo,
+				description: description,
+				orderID:     existingOrder.Id,
+			}, nil
+		}
+
+		// 创建主订单记录（用于支付系统）
+		order := model.Order{
+			Id:              uuid.NewString(),
+			OrderNo:         orderNo,
+			UserId:          userID,
+			ProductId:       "", // 白名单订单没有具体产品ID
+			PaymentPlatform: req.PayMethod,
+			PaymentScene:    "app", // 白名单订单，使用简短标识
+			Amount:          amount,
+			Status:          "pending",
+		}
+		if _, insertOrderErr := l.svcCtx.OrderModel.Insert(l.ctx, session, &order); insertOrderErr != nil {
+			return nil, errors.Wrapf(xerr.NewErrCode(xerr.DB_ERROR), "创建支付订单失败: %+v", insertOrderErr)
+		}
+
+		return &PaymentTypeResp{
+			amount:      amount,
+			outTradeNo:  orderNo,
+			description: description,
+			orderID:     order.Id,
+		}, nil
+	}
+
+	// 格式1："{idCard}|{featureApiId}" - 单个模块下架
+	parts := strings.SplitN(req.Id, "|", 2)
+	if len(parts) != 2 {
+		return nil, errors.Wrapf(xerr.NewErrMsg("参数错误：id 格式不正确，应为订单号（W_开头）或 {idCard}|{featureApiId}"), "")
+	}
+	idCard := parts[0]
+	featureApiId := parts[1]
+
+	if idCard == "" || featureApiId == "" {
+		return nil, errors.Wrapf(xerr.NewErrMsg("参数错误：身份证号或模块标识为空"), "")
+	}
+
+	// 查询 feature 信息
+	feature, err := l.svcCtx.FeatureModel.FindOneByApiId(l.ctx, featureApiId)
+	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)
+	}
+
+	amount = feature.WhitelistPrice
+	if amount <= 0 {
+		return nil, errors.Wrapf(xerr.NewErrMsg("该模块无需付费下架"), "")
+	}
+
+	// 获取用户信息（用于内部用户测试金额）
+	user, err := l.svcCtx.UserModel.FindOne(l.ctx, userID)
+	if err != nil {
+		return nil, errors.Wrapf(xerr.NewErrCode(xerr.DB_ERROR), "生成白名单订单, 获取用户信息失败: %v", err)
+	}
+	if user.Inside == 1 {
+		amount = 0.01
+	}
+
+	// 生成订单号（白名单订单前缀 W_，限制长度不超过32）
+	base := l.svcCtx.AlipayService.GenerateOutTradeNo()
+	outTradeNo := "W_" + base
+	if len(outTradeNo) > 32 {
+		outTradeNo = outTradeNo[:32]
+	}
+
+	// 创建主订单记录（用于支付系统）
+	order := model.Order{
+		Id:              uuid.NewString(),
+		OrderNo:         outTradeNo,
+		UserId:          userID,
+		ProductId:       "", // 白名单订单没有具体产品ID
+		PaymentPlatform: req.PayMethod,
+		PaymentScene:    "app", // 白名单订单，使用简短标识
+		Amount:          amount,
+		Status:          "pending",
+	}
+	if _, insertOrderErr := l.svcCtx.OrderModel.Insert(l.ctx, session, &order); insertOrderErr != nil {
+		return nil, errors.Wrapf(xerr.NewErrCode(xerr.DB_ERROR), "生成白名单订单, 保存订单失败: %+v", insertOrderErr)
+	}
+
+	// 创建白名单订单（业务订单，状态=待支付）
+	whitelistOrder = &model.WhitelistOrder{
+		Id:          uuid.NewString(),
+		OrderNo:     outTradeNo,
+		UserId:      userID,
+		IdCard:      idCard,
+		TotalAmount: amount,
+		Status:      1, // 待支付
+	}
+	if _, err := l.svcCtx.WhitelistOrderModel.Insert(l.ctx, session, whitelistOrder); err != nil {
+		return nil, errors.Wrapf(xerr.NewErrCode(xerr.DB_ERROR), "生成白名单订单, 保存白名单订单失败: %+v", err)
+	}
+
+	// 创建白名单订单明细
+	orderItem := &model.WhitelistOrderItem{
+		Id:           uuid.NewString(),
+		OrderId:      whitelistOrder.Id,
+		FeatureId:    feature.Id,
+		FeatureApiId: feature.ApiId,
+		FeatureName:  feature.Name,
+		Price:        amount,
+	}
+	if _, err := l.svcCtx.WhitelistOrderItemModel.Insert(l.ctx, session, orderItem); err != nil {
+		return nil, errors.Wrapf(xerr.NewErrCode(xerr.DB_ERROR), "生成白名单订单, 保存白名单订单明细失败: %+v", err)
+	}
+
+	description = fmt.Sprintf("模块下架：%s", feature.Name)
+
+	return &PaymentTypeResp{
+		amount:      amount,
+		outTradeNo:  outTradeNo,
+		description: description,
+		orderID:     order.Id,
+	}, nil
+}
+
 func (l *PaymentLogic) QueryOrderPayment(req *types.PaymentReq, session sqlx.Session) (resp *PaymentTypeResp, err error) {
 	userID, getUidErr := ctxdata.GetUidFromCtx(l.ctx)
 	if getUidErr != nil {

app/main/api/internal/logic/pay/wechatpaycallbacklogic.go

@@ -45,6 +45,9 @@ func (l *WechatPayCallbackLogic) WechatPayCallback(w http.ResponseWriter, r *htt
 	} else if strings.HasPrefix(orderNo, "U_") {
 		// 代理升级订单处理
 		return l.handleAgentUpgradeOrderPayment(w, notification)
+	} else if strings.HasPrefix(orderNo, "W_") {
+		// 白名单下架订单处理
+		return l.handleWhitelistOrderPayment(w, notification)
 	} else if strings.HasPrefix(orderNo, "A_") {
 		// 旧系统会员充值订单（已废弃，新系统使用升级功能）
 		// return l.handleAgentVipOrderPayment(w, notification)
@@ -109,6 +112,91 @@ func (l *WechatPayCallbackLogic) handleQueryOrderPayment(w http.ResponseWriter,
 	return nil
 }
 
+// 处理白名单下架订单支付
+func (l *WechatPayCallbackLogic) handleWhitelistOrderPayment(w http.ResponseWriter, notification *payments.Transaction) error {
+	orderNo := *notification.OutTradeNo
+
+	// 1. 查找订单
+	order, findOrderErr := l.svcCtx.OrderModel.FindOneByOrderNo(l.ctx, orderNo)
+	if findOrderErr != nil {
+		logx.Errorf("微信白名单支付回调，查找订单信息失败: %+v", findOrderErr)
+		return nil
+	}
+
+	// 2. 验证金额
+	amount := lzUtils.ToWechatAmount(order.Amount)
+	if amount != *notification.Amount.Total {
+		logx.Errorf("微信白名单支付回调，金额不一致")
+		return nil
+	}
+
+	// 3. 检查订单状态
+	if order.Status != "pending" {
+		w.WriteHeader(http.StatusOK)
+		_, _ = w.Write([]byte("success"))
+		return nil
+	}
+
+	// 4. 查找白名单订单
+	whitelistOrder, findWhitelistErr := l.svcCtx.WhitelistOrderModel.FindOneByOrderNo(l.ctx, orderNo)
+	if findWhitelistErr != nil {
+		logx.Errorf("微信白名单支付回调，查找白名单订单失败，订单号: %s, 错误: %+v", orderNo, findWhitelistErr)
+		return nil
+	}
+	if whitelistOrder.Status != 1 {
+		// 白名单订单状态不是待支付，直接返回成功
+		w.WriteHeader(http.StatusOK)
+		_, _ = w.Write([]byte("success"))
+		return nil
+	}
+
+	// 5. 处理支付状态
+	switch *notification.TradeState {
+	case service.TradeStateSuccess:
+		order.Status = "paid"
+		order.PayTime = lzUtils.TimeToNullTime(time.Now())
+		order.PlatformOrderId = lzUtils.StringToNullString(*notification.TransactionId)
+		whitelistOrder.Status = 2 // 已支付
+		whitelistOrder.PayTime = lzUtils.TimeToNullTime(time.Now())
+	case service.TradeStateClosed:
+		order.Status = "closed"
+		order.CloseTime = lzUtils.TimeToNullTime(time.Now())
+		whitelistOrder.Status = 3 // 已取消
+	default:
+		return nil
+	}
+
+	// 6. 更新订单和白名单订单 + 创建白名单记录并删除报告数据
+	err := l.svcCtx.WhitelistOrderModel.Trans(l.ctx, func(ctx context.Context, session sqlx.Session) error {
+		// 6.1 更新订单状态
+		if updateErr := l.svcCtx.OrderModel.UpdateWithVersion(ctx, session, order); updateErr != nil {
+			return errors.Wrapf(updateErr, "微信白名单支付回调，更新订单状态失败")
+		}
+
+		// 6.2 更新白名单订单状态
+		if updateErr := l.svcCtx.WhitelistOrderModel.UpdateWithVersion(ctx, session, whitelistOrder); updateErr != nil {
+			return errors.Wrapf(updateErr, "微信白名单支付回调，更新白名单订单状态失败")
+		}
+
+		// 6.3 如果支付成功，调用 WhitelistService 处理白名单和报告数据
+		if whitelistOrder.Status == 2 {
+			if processErr := l.svcCtx.WhitelistService.ProcessPaidWhitelistOrder(ctx, session, order, whitelistOrder); processErr != nil {
+				return errors.Wrapf(processErr, "微信白名单支付回调，处理白名单订单失败")
+			}
+		}
+
+		return nil
+	})
+	if err != nil {
+		logx.Errorf("微信白名单支付回调，事务处理失败: %+v", err)
+		return nil
+	}
+
+	w.WriteHeader(http.StatusOK)
+	_, _ = w.Write([]byte("success"))
+	return nil
+}
+
 // 处理代理升级订单支付
 func (l *WechatPayCallbackLogic) handleAgentUpgradeOrderPayment(w http.ResponseWriter, notification *payments.Transaction) error {
 	orderNo := *notification.OutTradeNo

app/main/api/internal/logic/pay/wechatpayrefundcallbacklogic.go

@@ -114,6 +114,21 @@ func (l *WechatPayRefundCallbackLogic) handleQueryOrderRefund(orderNo string, st
 		return errors.Wrapf(err, "更新订单和退款记录失败: %s", orderNo)
 	}
 
+	// 退款成功后，检查并处理代理订单（在事务外执行，避免影响退款流程）
+	if status == refunddomestic.STATUS_SUCCESS {
+		// 检查代理订单是否已处理
+		agentOrder, err := l.svcCtx.AgentOrderModel.FindOneByOrderId(l.ctx, order.Id)
+		if err == nil && agentOrder != nil && agentOrder.ProcessStatus == 1 {
+			// 代理订单已处理，需要撤销收益
+			if cancelErr := l.svcCtx.AgentService.CancelAgentCommission(l.ctx, order.Id); cancelErr != nil {
+				logx.Errorf("撤销代理收益失败，订单ID: %s, 错误: %v", order.Id, cancelErr)
+				// 不阻断退款流程，只记录日志（退款已成功，不能回滚）
+			} else {
+				logx.Infof("成功撤销代理收益，订单ID: %s", order.Id)
+			}
+		}
+	}
+
 	return nil
 }