增加用户注销功能

app/user/cmd/api/desc/user.api

@@ -59,6 +59,9 @@ service main {
 	@doc "get new token"
 	@handler getToken
 	post /user/getToken returns (MobileCodeLoginResp)
+
+	@handler cancelOut
+	post /user/cancelOut
 }
 
 //============================> auth v1 <============================

app/user/cmd/api/internal/handler/routes.go

@@ -339,6 +339,11 @@ func RegisterHandlers(server *rest.Server, serverCtx *svc.ServiceContext) {
 
 	server.AddRoutes(
 		[]rest.Route{
+			{
+				Method:  http.MethodPost,
+				Path:    "/user/cancelOut",
+				Handler: user.CancelOutHandler(serverCtx),
+			},
 			{
 				// get user info
 				Method:  http.MethodGet,

app/user/cmd/api/internal/handler/user/cancelouthandler.go

@@ -0,0 +1,17 @@
+package user
+
+import (
+	"net/http"
+
+	"tydata-server/app/user/cmd/api/internal/logic/user"
+	"tydata-server/app/user/cmd/api/internal/svc"
+	"tydata-server/common/result"
+)
+
+func CancelOutHandler(svcCtx *svc.ServiceContext) http.HandlerFunc {
+	return func(w http.ResponseWriter, r *http.Request) {
+		l := user.NewCancelOutLogic(r.Context(), svcCtx)
+		err := l.CancelOut()
+		result.HttpResult(r, w, nil, err)
+	}
+}

app/user/cmd/api/internal/logic/agent/applyforagentlogic.go

@@ -3,15 +3,16 @@ package agent
 import (
 	"context"
 	"fmt"
-	"github.com/pkg/errors"
-	"github.com/zeromicro/go-zero/core/stores/redis"
-	"github.com/zeromicro/go-zero/core/stores/sqlx"
 	"time"
 	"tydata-server/app/user/model"
 	jwtx "tydata-server/common/jwt"
 	"tydata-server/common/xerr"
 	"tydata-server/pkg/lzkit/lzUtils"
 
+	"github.com/pkg/errors"
+	"github.com/zeromicro/go-zero/core/stores/redis"
+	"github.com/zeromicro/go-zero/core/stores/sqlx"
+
 	"tydata-server/app/user/cmd/api/internal/svc"
 	"tydata-server/app/user/cmd/api/internal/types"
 
@@ -79,11 +80,16 @@ func (l *ApplyForAgentLogic) ApplyForAgent(req *types.AgentApplyReq) (resp *type
 			}
 		}
 		userID = user.Id
-		agentAuditModel, findAgentAuditErr := l.svcCtx.AgentAuditModel.FindOneByUserId(transCtx, user.Id)
+
-		if findAgentAuditErr != nil && !errors.Is(findAgentAuditErr, model.ErrNotFound) {
+		// 使用SelectBuilder构建查询，查找符合user_id的记录并按创建时间降序排序获取最新一条
+		builder := l.svcCtx.AgentAuditModel.SelectBuilder().Where("user_id = ?", user.Id).OrderBy("create_time DESC").Limit(1)
+		agentAuditList, findAgentAuditErr := l.svcCtx.AgentAuditModel.FindAll(transCtx, builder, "")
+		if findAgentAuditErr != nil {
 			return errors.Wrapf(xerr.NewErrCode(xerr.DB_ERROR), "代理申请, 查找审核列表失败%+v", findAgentAuditErr)
 		}
-		if agentAuditModel != nil {
+
+		if len(agentAuditList) > 0 {
+			agentAuditModel := agentAuditList[0]
 			if agentAuditModel.Status == 0 {
 				return errors.Wrapf(xerr.NewErrMsg("您的代理申请中"), "代理申请, 代理申请中")
 			} else {

app/user/cmd/api/internal/logic/agent/getagentauditstatuslogic.go

@@ -2,11 +2,12 @@ package agent
 
 import (
 	"context"
-	"github.com/jinzhu/copier"
-	"github.com/pkg/errors"
 	"tydata-server/common/ctxdata"
 	"tydata-server/common/xerr"
 
+	"github.com/jinzhu/copier"
+	"github.com/pkg/errors"
+
 	"tydata-server/app/user/cmd/api/internal/svc"
 	"tydata-server/app/user/cmd/api/internal/types"
 
@@ -32,11 +33,19 @@ func (l *GetAgentAuditStatusLogic) GetAgentAuditStatus() (resp *types.AgentAudit
 	if err != nil {
 		return nil, errors.Wrapf(xerr.NewErrCode(xerr.SERVER_COMMON_ERROR), "获取代理审核信息, %v", err)
 	}
-	agentAuditModel, err := l.svcCtx.AgentAuditModel.FindOneByUserId(l.ctx, userID)
+
+	// 使用SelectBuilder构建查询，查找符合user_id的记录并按创建时间降序排序获取最新一条
+	builder := l.svcCtx.AgentAuditModel.SelectBuilder().Where("user_id = ?", userID).OrderBy("create_time DESC").Limit(1)
+	agentAuditList, err := l.svcCtx.AgentAuditModel.FindAll(l.ctx, builder, "")
 	if err != nil {
 		return nil, errors.Wrapf(xerr.NewErrCode(xerr.DB_ERROR), "获取代理审核信息, %v", err)
 	}
 
+	if len(agentAuditList) == 0 {
+		return nil, errors.Wrapf(xerr.NewErrCode(xerr.DB_ERROR), "未找到代理审核信息")
+	}
+
+	agentAuditModel := agentAuditList[0]
 	var agentAuditStautsResp types.AgentAuditStatusResp
 	copier.Copy(&agentAuditStautsResp, agentAuditModel)
 	return &agentAuditStautsResp, nil

app/user/cmd/api/internal/logic/agent/getagentinfologic.go

@@ -3,12 +3,12 @@ package agent
 import (
 	"context"
 	"database/sql"
-	"github.com/pkg/errors"
-	"tydata-server/app/user/model"
 	"tydata-server/common/ctxdata"
 	"tydata-server/common/xerr"
 	"tydata-server/pkg/lzkit/lzUtils"
 
+	"github.com/pkg/errors"
+
 	"tydata-server/app/user/cmd/api/internal/svc"
 	"tydata-server/app/user/cmd/api/internal/types"
 
@@ -37,16 +37,21 @@ func (l *GetAgentInfoLogic) GetAgentInfo() (resp *types.AgentInfoResp, err error
 	agent, err := l.svcCtx.AgentModel.FindOneByUserId(l.ctx, userID)
 	if err != nil {
 		if errors.Is(err, sql.ErrNoRows) {
-			agentAuditModel, findAgentAuditErr := l.svcCtx.AgentAuditModel.FindOneByUserId(l.ctx, userID)
+			builder := l.svcCtx.AgentAuditModel.SelectBuilder().Where("user_id = ?", userID).OrderBy("create_time DESC").Limit(1)
-			if findAgentAuditErr != nil && !errors.Is(findAgentAuditErr, model.ErrNotFound) {
+			agentAuditList, findAgentAuditErr := l.svcCtx.AgentAuditModel.FindAll(l.ctx, builder, "")
-				return nil, errors.Wrapf(xerr.NewErrCode(xerr.DB_ERROR), "获取代理信息, %v", err)
+
+			if findAgentAuditErr != nil {
+				return nil, errors.Wrapf(xerr.NewErrCode(xerr.DB_ERROR), "获取代理信息, %v", findAgentAuditErr)
 			}
-			if errors.Is(findAgentAuditErr, model.ErrNotFound) {
+
+			if len(agentAuditList) == 0 {
 				return &types.AgentInfoResp{
 					IsAgent: false,
 					Status:  3,
 				}, nil
 			}
+
+			agentAuditModel := agentAuditList[0]
 			return &types.AgentInfoResp{
 				IsAgent: false,
 				Status:  agentAuditModel.Status,

app/user/cmd/api/internal/logic/agent/getagentproductconfiglogic.go

@@ -2,12 +2,13 @@ package agent
 
 import (
 	"context"
-	"github.com/pkg/errors"
-	"github.com/zeromicro/go-zero/core/mr"
 	"tydata-server/app/user/model"
 	"tydata-server/common/ctxdata"
 	"tydata-server/common/xerr"
 
+	"github.com/pkg/errors"
+	"github.com/zeromicro/go-zero/core/mr"
+
 	"tydata-server/app/user/cmd/api/internal/svc"
 	"tydata-server/app/user/cmd/api/internal/types"
 

app/user/cmd/api/internal/logic/user/canceloutlogic.go

@@ -0,0 +1,252 @@
+package user
+
+import (
+	"context"
+	"tydata-server/app/user/model"
+	"tydata-server/common/ctxdata"
+	"tydata-server/common/xerr"
+
+	"github.com/zeromicro/go-zero/core/mr"
+
+	"github.com/pkg/errors"
+	"github.com/zeromicro/go-zero/core/stores/sqlx"
+
+	"tydata-server/app/user/cmd/api/internal/svc"
+
+	"github.com/zeromicro/go-zero/core/logx"
+)
+
+type CancelOutLogic struct {
+	logx.Logger
+	ctx    context.Context
+	svcCtx *svc.ServiceContext
+}
+
+func NewCancelOutLogic(ctx context.Context, svcCtx *svc.ServiceContext) *CancelOutLogic {
+	return &CancelOutLogic{
+		Logger: logx.WithContext(ctx),
+		ctx:    ctx,
+		svcCtx: svcCtx,
+	}
+}
+
+func (l *CancelOutLogic) CancelOut() error {
+	userID, getUserIdErr := ctxdata.GetUidFromCtx(l.ctx)
+	if getUserIdErr != nil {
+		return errors.Wrapf(xerr.NewErrCode(xerr.SERVER_COMMON_ERROR), "用户信息, %v", getUserIdErr)
+	}
+
+	// 1. 先检查用户是否是代理
+	agentModel, err := l.svcCtx.AgentModel.FindOneByUserId(l.ctx, userID)
+	if err != nil && !errors.Is(err, model.ErrNotFound) {
+		return errors.Wrapf(err, "查询代理信息失败, userId: %d", userID)
+	}
+
+	// 如果用户是代理，进行额外检查
+	if agentModel != nil {
+		// 1.1 检查代理等级是否为VIP或SVIP
+		if agentModel.LevelName == model.AgentLeveNameVIP || agentModel.LevelName == model.AgentLeveNameSVIP {
+			return errors.Wrapf(xerr.NewErrMsg("您是"+agentModel.LevelName+"会员，请联系客服进行注销"), "用户是代理会员，不能注销")
+		}
+
+		// 1.2 检查代理钱包是否有余额或冻结金额
+		wallet, err := l.svcCtx.AgentWalletModel.FindOneByAgentId(l.ctx, agentModel.Id)
+		if err != nil && !errors.Is(err, model.ErrNotFound) {
+			return errors.Wrapf(xerr.NewErrCode(xerr.DB_ERROR), "查询代理钱包失败, agentId: %d", agentModel.Id)
+		}
+
+		if wallet != nil && (wallet.Balance > 0 || wallet.FrozenBalance > 0) {
+			if wallet.Balance > 0 {
+				return errors.Wrapf(xerr.NewErrMsg("您的钱包还有余额%.2f元，请先提现后再注销账号"), "用户钱包有余额，不能注销", wallet.Balance)
+			}
+			if wallet.FrozenBalance > 0 {
+				return errors.Wrapf(xerr.NewErrMsg("您的钱包还有冻结金额%.2f元，请等待解冻后再注销账号"), "用户钱包有冻结金额，不能注销", wallet.FrozenBalance)
+			}
+		}
+	}
+
+	// 在事务中处理用户注销相关操作
+	err = l.svcCtx.UserModel.Trans(l.ctx, func(tranCtx context.Context, session sqlx.Session) error {
+		// 1. 删除用户基本信息
+		if err := l.svcCtx.UserModel.Delete(tranCtx, session, userID); err != nil {
+			return errors.Wrapf(err, "删除用户基本信息失败, userId: %d", userID)
+		}
+
+		// 2. 查询并删除用户授权信息
+		UserAuthModelBuilder := l.svcCtx.UserAuthModel.SelectBuilder().Where("user_id = ?", userID)
+		userAuths, err := l.svcCtx.UserAuthModel.FindAll(tranCtx, UserAuthModelBuilder, "")
+		if err != nil && !errors.Is(err, model.ErrNotFound) {
+			return errors.Wrapf(err, "查询用户授权信息失败, userId: %d", userID)
+		}
+
+		// 并发删除用户授权信息
+		if len(userAuths) > 0 {
+			funcs := make([]func() error, len(userAuths))
+			for i, userAuth := range userAuths {
+				authID := userAuth.Id
+				funcs[i] = func() error {
+					return l.svcCtx.UserAuthModel.Delete(tranCtx, session, authID)
+				}
+			}
+
+			if err := mr.Finish(funcs...); err != nil {
+				return errors.Wrapf(err, "删除用户授权信息失败")
+			}
+		}
+
+		// 3. 处理代理相关信息
+		if agentModel != nil {
+			// 3.1 删除代理信息
+			if err := l.svcCtx.AgentModel.Delete(tranCtx, session, agentModel.Id); err != nil {
+				return errors.Wrapf(err, "删除代理信息失败, agentId: %d", agentModel.Id)
+			}
+
+			// 3.2 查询并删除代理会员配置
+			configBuilder := l.svcCtx.AgentMembershipUserConfigModel.SelectBuilder().Where("agent_id = ?", agentModel.Id)
+			configs, err := l.svcCtx.AgentMembershipUserConfigModel.FindAll(tranCtx, configBuilder, "")
+			if err != nil && !errors.Is(err, model.ErrNotFound) {
+				return errors.Wrapf(err, "查询代理会员配置失败, agentId: %d", agentModel.Id)
+			}
+
+			// 并发删除代理会员配置
+			if len(configs) > 0 {
+				configFuncs := make([]func() error, len(configs))
+				for i, config := range configs {
+					configId := config.Id
+					configFuncs[i] = func() error {
+						return l.svcCtx.AgentMembershipUserConfigModel.Delete(tranCtx, session, configId)
+					}
+				}
+
+				if err := mr.Finish(configFuncs...); err != nil {
+					return errors.Wrapf(err, "删除代理会员配置失败")
+				}
+			}
+
+			// 3.3 删除代理钱包信息
+			wallet, err := l.svcCtx.AgentWalletModel.FindOneByAgentId(tranCtx, agentModel.Id)
+			if err != nil && !errors.Is(err, model.ErrNotFound) {
+				return errors.Wrapf(err, "查询代理钱包信息失败, agentId: %d", agentModel.Id)
+			}
+
+			if wallet != nil {
+				if err := l.svcCtx.AgentWalletModel.Delete(tranCtx, session, wallet.Id); err != nil {
+					return errors.Wrapf(err, "删除代理钱包信息失败, walletId: %d", wallet.Id)
+				}
+			}
+
+			// 3.4 删除代理关系信息
+			closureBuilder := l.svcCtx.AgentClosureModel.SelectBuilder().Where("ancestor_id = ? AND depth = ?", agentModel.Id, 1)
+			closures, err := l.svcCtx.AgentClosureModel.FindAll(tranCtx, closureBuilder, "")
+			if err != nil && !errors.Is(err, model.ErrNotFound) {
+				return errors.Wrapf(err, "查询代理关系信息失败, agentId: %d", agentModel.Id)
+			}
+
+			if len(closures) > 0 {
+				closureFuncs := make([]func() error, len(closures))
+				for i, closure := range closures {
+					closureId := closure.Id
+					closureFuncs[i] = func() error {
+						return l.svcCtx.AgentClosureModel.Delete(tranCtx, session, closureId)
+					}
+				}
+
+				if err := mr.Finish(closureFuncs...); err != nil {
+					return errors.Wrapf(err, "删除代理关系信息失败")
+				}
+			}
+		}
+
+		// 4. 查询并删除代理审核信息
+		auditBuilder := l.svcCtx.AgentAuditModel.SelectBuilder().Where("user_id = ?", userID)
+		audits, err := l.svcCtx.AgentAuditModel.FindAll(tranCtx, auditBuilder, "")
+		if err != nil && !errors.Is(err, model.ErrNotFound) {
+			return errors.Wrapf(err, "查询代理审核信息失败, userId: %d", userID)
+		}
+
+		// 并发删除代理审核信息
+		if len(audits) > 0 {
+			auditFuncs := make([]func() error, len(audits))
+			for i, audit := range audits {
+				auditId := audit.Id
+				auditFuncs[i] = func() error {
+					return l.svcCtx.AgentAuditModel.Delete(tranCtx, session, auditId)
+				}
+			}
+
+			if err := mr.Finish(auditFuncs...); err != nil {
+				return errors.Wrapf(err, "删除代理审核信息失败")
+			}
+		}
+
+		// 5. 删除用户查询记录
+		queryBuilder := l.svcCtx.QueryModel.SelectBuilder().Where("user_id = ?", userID)
+		queries, err := l.svcCtx.QueryModel.FindAll(tranCtx, queryBuilder, "")
+		if err != nil && !errors.Is(err, model.ErrNotFound) {
+			return errors.Wrapf(err, "查询用户查询记录失败, userId: %d", userID)
+		}
+
+		if len(queries) > 0 {
+			queryFuncs := make([]func() error, len(queries))
+			for i, query := range queries {
+				queryId := query.Id
+				queryFuncs[i] = func() error {
+					return l.svcCtx.QueryModel.Delete(tranCtx, session, queryId)
+				}
+			}
+
+			if err := mr.Finish(queryFuncs...); err != nil {
+				return errors.Wrapf(err, "删除用户查询记录失败")
+			}
+		}
+
+		// 6. 删除用户订单记录
+		orderBuilder := l.svcCtx.OrderModel.SelectBuilder().Where("user_id = ?", userID)
+		orders, err := l.svcCtx.OrderModel.FindAll(tranCtx, orderBuilder, "")
+		if err != nil && !errors.Is(err, model.ErrNotFound) {
+			return errors.Wrapf(err, "查询用户订单记录失败, userId: %d", userID)
+		}
+
+		if len(orders) > 0 {
+			orderFuncs := make([]func() error, len(orders))
+			for i, order := range orders {
+				orderId := order.Id
+				orderFuncs[i] = func() error {
+					return l.svcCtx.OrderModel.Delete(tranCtx, session, orderId)
+				}
+			}
+
+			if err := mr.Finish(orderFuncs...); err != nil {
+				return errors.Wrapf(err, "删除用户订单记录失败")
+			}
+		}
+
+		// 7. 删除代理订单信息
+		agentOrderBuilder := l.svcCtx.AgentOrderModel.SelectBuilder().Where("user_id = ?", userID)
+		agentOrders, err := l.svcCtx.AgentOrderModel.FindAll(tranCtx, agentOrderBuilder, "")
+		if err != nil && !errors.Is(err, model.ErrNotFound) {
+			return errors.Wrapf(err, "查询代理订单信息失败, userId: %d", userID)
+		}
+
+		if len(agentOrders) > 0 {
+			agentOrderFuncs := make([]func() error, len(agentOrders))
+			for i, agentOrder := range agentOrders {
+				agentOrderId := agentOrder.Id
+				agentOrderFuncs[i] = func() error {
+					return l.svcCtx.AgentOrderModel.Delete(tranCtx, session, agentOrderId)
+				}
+			}
+
+			if err := mr.Finish(agentOrderFuncs...); err != nil {
+				return errors.Wrapf(err, "删除代理订单信息失败")
+			}
+		}
+		return nil
+	})
+
+	if err != nil {
+		return errors.Wrapf(xerr.NewErrCode(xerr.DB_ERROR), "用户注销失败%v", err)
+	}
+
+	return nil
+}

app/user/cmd/api/internal/service/agentService.go

@@ -2,11 +2,12 @@ package service
 
 import (
 	"context"
-	"github.com/pkg/errors"
-	"github.com/zeromicro/go-zero/core/stores/sqlx"
 	"tydata-server/app/user/cmd/api/internal/config"
 	"tydata-server/app/user/model"
 	"tydata-server/pkg/lzkit/lzUtils"
+
+	"github.com/pkg/errors"
+	"github.com/zeromicro/go-zero/core/stores/sqlx"
 )
 
 type AgentService struct {

app/user/cmd/api/internal/svc/servicecontext.go

@@ -1,15 +1,16 @@
 package svc
 
 import (
+	"tydata-server/app/user/cmd/api/internal/config"
+	"tydata-server/app/user/cmd/api/internal/middleware"
+	"tydata-server/app/user/cmd/api/internal/service"
+	"tydata-server/app/user/model"
+
 	"github.com/hibiken/asynq"
 	"github.com/zeromicro/go-zero/core/logx"
 	"github.com/zeromicro/go-zero/core/stores/redis"
 	"github.com/zeromicro/go-zero/core/stores/sqlx"
 	"github.com/zeromicro/go-zero/rest"
-	"tydata-server/app/user/cmd/api/internal/config"
-	"tydata-server/app/user/cmd/api/internal/middleware"
-	"tydata-server/app/user/cmd/api/internal/service"
-	"tydata-server/app/user/model"
 )
 
 type ServiceContext struct {

app/user/model/agentAuditModel_gen.go

@@ -27,14 +27,12 @@ var (
 	agentAuditRowsWithPlaceHolder = strings.Join(stringx.Remove(agentAuditFieldNames, "`id`", "`create_time`", "`update_time`"), "=?,") + "=?"
 
 	cacheTydataAgentAuditIdPrefix = "cache:tydata:agentAudit:id:"
-	cacheTydataAgentAuditUserIdPrefix = "cache:tydata:agentAudit:userId:"
 )
 
 type (
 	agentAuditModel interface {
 		Insert(ctx context.Context, session sqlx.Session, data *AgentAudit) (sql.Result, error)
 		FindOne(ctx context.Context, id int64) (*AgentAudit, error)
-		FindOneByUserId(ctx context.Context, userId int64) (*AgentAudit, error)
 		Update(ctx context.Context, session sqlx.Session, data *AgentAudit) (sql.Result, error)
 		UpdateWithVersion(ctx context.Context, session sqlx.Session, data *AgentAudit) error
 		Trans(ctx context.Context, fn func(context context.Context, session sqlx.Session) error) error
@@ -82,14 +80,13 @@ func newAgentAuditModel(conn sqlx.SqlConn, c cache.CacheConf) *defaultAgentAudit
 func (m *defaultAgentAuditModel) Insert(ctx context.Context, session sqlx.Session, data *AgentAudit) (sql.Result, error) {
 	data.DelState = globalkey.DelStateNo
 	tydataAgentAuditIdKey := fmt.Sprintf("%s%v", cacheTydataAgentAuditIdPrefix, data.Id)
-	tydataAgentAuditUserIdKey := fmt.Sprintf("%s%v", cacheTydataAgentAuditUserIdPrefix, data.UserId)
 	return m.ExecCtx(ctx, func(ctx context.Context, conn sqlx.SqlConn) (result sql.Result, err error) {
 		query := fmt.Sprintf("insert into %s (%s) values (?, ?, ?, ?, ?, ?, ?, ?, ?, ?)", m.table, agentAuditRowsExpectAutoSet)
 		if session != nil {
 			return session.ExecCtx(ctx, query, data.UserId, data.Region, data.Mobile, data.WechatId, data.Status, data.AuditReason, data.AuditTime, data.DeleteTime, data.DelState, data.Version)
 		}
 		return conn.ExecCtx(ctx, query, data.UserId, data.Region, data.Mobile, data.WechatId, data.Status, data.AuditReason, data.AuditTime, data.DeleteTime, data.DelState, data.Version)
-	}, tydataAgentAuditIdKey, tydataAgentAuditUserIdKey)
+	}, tydataAgentAuditIdKey)
 }
 
 func (m *defaultAgentAuditModel) FindOne(ctx context.Context, id int64) (*AgentAudit, error) {
@@ -109,63 +106,33 @@ func (m *defaultAgentAuditModel) FindOne(ctx context.Context, id int64) (*AgentA
 	}
 }
 
-func (m *defaultAgentAuditModel) FindOneByUserId(ctx context.Context, userId int64) (*AgentAudit, error) {
+func (m *defaultAgentAuditModel) Update(ctx context.Context, session sqlx.Session, data *AgentAudit) (sql.Result, error) {
-	tydataAgentAuditUserIdKey := fmt.Sprintf("%s%v", cacheTydataAgentAuditUserIdPrefix, userId)
-	var resp AgentAudit
-	err := m.QueryRowIndexCtx(ctx, &resp, tydataAgentAuditUserIdKey, m.formatPrimary, func(ctx context.Context, conn sqlx.SqlConn, v interface{}) (i interface{}, e error) {
-		query := fmt.Sprintf("select %s from %s where `user_id` = ? and del_state = ? limit 1", agentAuditRows, m.table)
-		if err := conn.QueryRowCtx(ctx, &resp, query, userId, globalkey.DelStateNo); err != nil {
-			return nil, err
-		}
-		return resp.Id, nil
-	}, m.queryPrimary)
-	switch err {
-	case nil:
-		return &resp, nil
-	case sqlc.ErrNotFound:
-		return nil, ErrNotFound
-	default:
-		return nil, err
-	}
-}
-
-func (m *defaultAgentAuditModel) Update(ctx context.Context, session sqlx.Session, newData *AgentAudit) (sql.Result, error) {
-	data, err := m.FindOne(ctx, newData.Id)
-	if err != nil {
-		return nil, err
-	}
 	tydataAgentAuditIdKey := fmt.Sprintf("%s%v", cacheTydataAgentAuditIdPrefix, data.Id)
-	tydataAgentAuditUserIdKey := fmt.Sprintf("%s%v", cacheTydataAgentAuditUserIdPrefix, data.UserId)
 	return m.ExecCtx(ctx, func(ctx context.Context, conn sqlx.SqlConn) (result sql.Result, err error) {
 		query := fmt.Sprintf("update %s set %s where `id` = ?", m.table, agentAuditRowsWithPlaceHolder)
 		if session != nil {
-			return session.ExecCtx(ctx, query, newData.UserId, newData.Region, newData.Mobile, newData.WechatId, newData.Status, newData.AuditReason, newData.AuditTime, newData.DeleteTime, newData.DelState, newData.Version, newData.Id)
+			return session.ExecCtx(ctx, query, data.UserId, data.Region, data.Mobile, data.WechatId, data.Status, data.AuditReason, data.AuditTime, data.DeleteTime, data.DelState, data.Version, data.Id)
 		}
-		return conn.ExecCtx(ctx, query, newData.UserId, newData.Region, newData.Mobile, newData.WechatId, newData.Status, newData.AuditReason, newData.AuditTime, newData.DeleteTime, newData.DelState, newData.Version, newData.Id)
+		return conn.ExecCtx(ctx, query, data.UserId, data.Region, data.Mobile, data.WechatId, data.Status, data.AuditReason, data.AuditTime, data.DeleteTime, data.DelState, data.Version, data.Id)
-	}, tydataAgentAuditIdKey, tydataAgentAuditUserIdKey)
+	}, tydataAgentAuditIdKey)
 }
 
-func (m *defaultAgentAuditModel) UpdateWithVersion(ctx context.Context, session sqlx.Session, newData *AgentAudit) error {
+func (m *defaultAgentAuditModel) UpdateWithVersion(ctx context.Context, session sqlx.Session, data *AgentAudit) error {
 
-	oldVersion := newData.Version
+	oldVersion := data.Version
-	newData.Version += 1
+	data.Version += 1
 
 	var sqlResult sql.Result
 	var err error
 
-	data, err := m.FindOne(ctx, newData.Id)
-	if err != nil {
-		return err
-	}
 	tydataAgentAuditIdKey := fmt.Sprintf("%s%v", cacheTydataAgentAuditIdPrefix, data.Id)
-	tydataAgentAuditUserIdKey := fmt.Sprintf("%s%v", cacheTydataAgentAuditUserIdPrefix, data.UserId)
 	sqlResult, err = m.ExecCtx(ctx, func(ctx context.Context, conn sqlx.SqlConn) (result sql.Result, err error) {
 		query := fmt.Sprintf("update %s set %s where `id` = ? and version = ? ", m.table, agentAuditRowsWithPlaceHolder)
 		if session != nil {
-			return session.ExecCtx(ctx, query, newData.UserId, newData.Region, newData.Mobile, newData.WechatId, newData.Status, newData.AuditReason, newData.AuditTime, newData.DeleteTime, newData.DelState, newData.Version, newData.Id, oldVersion)
+			return session.ExecCtx(ctx, query, data.UserId, data.Region, data.Mobile, data.WechatId, data.Status, data.AuditReason, data.AuditTime, data.DeleteTime, data.DelState, data.Version, data.Id, oldVersion)
 		}
-		return conn.ExecCtx(ctx, query, newData.UserId, newData.Region, newData.Mobile, newData.WechatId, newData.Status, newData.AuditReason, newData.AuditTime, newData.DeleteTime, newData.DelState, newData.Version, newData.Id, oldVersion)
+		return conn.ExecCtx(ctx, query, data.UserId, data.Region, data.Mobile, data.WechatId, data.Status, data.AuditReason, data.AuditTime, data.DeleteTime, data.DelState, data.Version, data.Id, oldVersion)
-	}, tydataAgentAuditIdKey, tydataAgentAuditUserIdKey)
+	}, tydataAgentAuditIdKey)
 	if err != nil {
 		return err
 	}
@@ -184,7 +151,7 @@ func (m *defaultAgentAuditModel) DeleteSoft(ctx context.Context, session sqlx.Se
 	data.DelState = globalkey.DelStateYes
 	data.DeleteTime = sql.NullTime{Time: time.Now(), Valid: true}
 	if err := m.UpdateWithVersion(ctx, session, data); err != nil {
-		return errors.Wrapf(errors.New("delete soft failed "), "AgentAuditModel delete err : %v", err)
+		return errors.Wrapf(errors.New("delete soft failed "), "AgentAuditModel delete err : %+v", err)
 	}
 	return nil
 }
@@ -383,20 +350,14 @@ func (m *defaultAgentAuditModel) SelectBuilder() squirrel.SelectBuilder {
 	return squirrel.Select().From(m.table)
 }
 func (m *defaultAgentAuditModel) Delete(ctx context.Context, session sqlx.Session, id int64) error {
-	data, err := m.FindOne(ctx, id)
-	if err != nil {
-		return err
-	}
-
 	tydataAgentAuditIdKey := fmt.Sprintf("%s%v", cacheTydataAgentAuditIdPrefix, id)
-	tydataAgentAuditUserIdKey := fmt.Sprintf("%s%v", cacheTydataAgentAuditUserIdPrefix, data.UserId)
+	_, err := m.ExecCtx(ctx, func(ctx context.Context, conn sqlx.SqlConn) (result sql.Result, err error) {
-	_, err = m.ExecCtx(ctx, func(ctx context.Context, conn sqlx.SqlConn) (result sql.Result, err error) {
 		query := fmt.Sprintf("delete from %s where `id` = ?", m.table)
 		if session != nil {
 			return session.ExecCtx(ctx, query, id)
 		}
 		return conn.ExecCtx(ctx, query, id)
-	}, tydataAgentAuditIdKey, tydataAgentAuditUserIdKey)
+	}, tydataAgentAuditIdKey)
 	return err
 }
 func (m *defaultAgentAuditModel) formatPrimary(primary interface{}) string {