增加用户注销功能
This commit is contained in:
		| @@ -26,15 +26,13 @@ var ( | ||||
| 	agentAuditRowsExpectAutoSet   = strings.Join(stringx.Remove(agentAuditFieldNames, "`id`", "`create_time`", "`update_time`"), ",") | ||||
| 	agentAuditRowsWithPlaceHolder = strings.Join(stringx.Remove(agentAuditFieldNames, "`id`", "`create_time`", "`update_time`"), "=?,") + "=?" | ||||
|  | ||||
| 	cacheTydataAgentAuditIdPrefix     = "cache:tydata:agentAudit:id:" | ||||
| 	cacheTydataAgentAuditUserIdPrefix = "cache:tydata:agentAudit:userId:" | ||||
| 	cacheTydataAgentAuditIdPrefix = "cache:tydata:agentAudit:id:" | ||||
| ) | ||||
|  | ||||
| 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) { | ||||
| 	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 | ||||
| 	} | ||||
| func (m *defaultAgentAuditModel) Update(ctx context.Context, session sqlx.Session, data *AgentAudit) (sql.Result, error) { | ||||
| 	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) | ||||
| 	}, tydataAgentAuditIdKey, tydataAgentAuditUserIdKey) | ||||
| 		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) | ||||
| } | ||||
|  | ||||
| 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 | ||||
| 	newData.Version += 1 | ||||
| 	oldVersion := data.Version | ||||
| 	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) | ||||
| 	}, tydataAgentAuditIdKey, tydataAgentAuditUserIdKey) | ||||
| 		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) | ||||
| 	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 { | ||||
|   | ||||
		Reference in New Issue
	
	Block a user