完成合并：解决代码冲突

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

@@ -4,10 +4,10 @@ import (
 	"context"
 	"database/sql"
 	"fmt"
-	"time"
-	"qnc-server/common/globalkey"
+	"os"
 	"qnc-server/common/xerr"
 	"qnc-server/pkg/lzkit/lzUtils"
+	"time"
 
 	"github.com/pkg/errors"
 	"github.com/zeromicro/go-zero/core/stores/sqlx"
@@ -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)
@@ -46,39 +53,126 @@ 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, "更新提现记录失败")
-			}
+		switch req.Status {
+		case 2: // 审核通过
+			// 4.1 根据提现方式处理
+			switch withdrawal.WithdrawalType {
+			case 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, "更新提现记录失败")
+					}
+				}
+
+			case 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 +190,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,30 +198,9 @@ 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 { // 审核拒绝
+		case 3: // 审核拒绝
 			// 4.1 更新提现记录状态为拒绝
 			withdrawal.Status = 3 // 审核拒绝
 			withdrawal.Remark = sql.NullString{String: req.Remark, Valid: true}

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/agent/applywithdrawallogic.go

@@ -3,12 +3,11 @@ package agent
 import (
 	"context"
 	"fmt"
-	"time"
 	"qnc-server/app/main/model"
 	"qnc-server/common/ctxdata"
-	"qnc-server/common/globalkey"
 	"qnc-server/common/xerr"
 	"qnc-server/pkg/lzkit/lzUtils"
+	"time"
 
 	"github.com/google/uuid"
 	"github.com/pkg/errors"
@@ -62,53 +61,138 @@ 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. 生成提现单号（WD开头 + GenerateOutTradeNo生成的订单号，确保总长度不超过32个字符）
+	orderNo := l.svcCtx.AlipayService.GenerateOutTradeNo()
+	withdrawNo := "WD" + orderNo
+	// 确保总长度不超过32个字符
+	if len(withdrawNo) > 32 {
+		withdrawNo = withdrawNo[:32]
+	}
 
-	// 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 +201,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 +251,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,30 @@
+package agent
+
+import (
+	"context"
+
+	"qnc-server/app/main/api/internal/svc"
+	"qnc-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) {
+	// todo: add your logic here and delete this line
+
+	return
+}

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

@@ -0,0 +1,30 @@
+package agent
+
+import (
+	"context"
+
+	"qnc-server/app/main/api/internal/svc"
+	"qnc-server/app/main/api/internal/types"
+
+	"github.com/zeromicro/go-zero/core/logx"
+)
+
+type CheckOrderAgentLogic struct {
+	logx.Logger
+	ctx    context.Context
+	svcCtx *svc.ServiceContext
+}
+
+func NewCheckOrderAgentLogic(ctx context.Context, svcCtx *svc.ServiceContext) *CheckOrderAgentLogic {
+	return &CheckOrderAgentLogic{
+		Logger: logx.WithContext(ctx),
+		ctx:    ctx,
+		svcCtx: svcCtx,
+	}
+}
+
+func (l *CheckOrderAgentLogic) CheckOrderAgent(req *types.CheckOrderAgentReq) (resp *types.CheckOrderAgentResp, err error) {
+	// todo: add your logic here and delete this line
+
+	return
+}

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

@@ -0,0 +1,30 @@
+package agent
+
+import (
+	"context"
+
+	"qnc-server/app/main/api/internal/svc"
+	"qnc-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) {
+	// todo: add your logic here and delete this line
+
+	return
+}

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

@@ -0,0 +1,95 @@
+package agent
+
+import (
+	"context"
+	"qnc-server/app/main/model"
+	"qnc-server/common/ctxdata"
+	"qnc-server/common/xerr"
+
+	"github.com/pkg/errors"
+
+	"qnc-server/app/main/api/internal/svc"
+	"qnc-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/getwhitelistfeatureslogic.go

@@ -0,0 +1,30 @@
+package agent
+
+import (
+	"context"
+
+	"qnc-server/app/main/api/internal/svc"
+	"qnc-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) {
+	// todo: add your logic here and delete this line
+
+	return
+}

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

@@ -0,0 +1,30 @@
+package agent
+
+import (
+	"context"
+
+	"qnc-server/app/main/api/internal/svc"
+	"qnc-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) {
+	// todo: add your logic here and delete this line
+
+	return
+}

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,30 @@
+package agent
+
+import (
+	"context"
+
+	"qnc-server/app/main/api/internal/svc"
+	"qnc-server/app/main/api/internal/types"
+
+	"github.com/zeromicro/go-zero/core/logx"
+)
+
+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) {
+	// todo: add your logic here and delete this line
+
+	return
+}