v1.1
This commit is contained in:
@@ -8,34 +8,37 @@ import (
|
||||
"fmt"
|
||||
"strings"
|
||||
|
||||
"reflect"
|
||||
"time"
|
||||
|
||||
"ycc-server/common/globalkey"
|
||||
|
||||
"github.com/Masterminds/squirrel"
|
||||
"github.com/google/uuid"
|
||||
"github.com/pkg/errors"
|
||||
"github.com/zeromicro/go-zero/core/stores/builder"
|
||||
"github.com/zeromicro/go-zero/core/stores/cache"
|
||||
"github.com/zeromicro/go-zero/core/stores/sqlc"
|
||||
"github.com/zeromicro/go-zero/core/stores/sqlx"
|
||||
"github.com/zeromicro/go-zero/core/stringx"
|
||||
"ycc-server/common/globalkey"
|
||||
)
|
||||
|
||||
var (
|
||||
agentFieldNames = builder.RawFieldNames(&Agent{})
|
||||
agentRows = strings.Join(agentFieldNames, ",")
|
||||
agentRowsExpectAutoSet = strings.Join(stringx.Remove(agentFieldNames, "`id`", "`create_time`", "`update_time`"), ",")
|
||||
agentRowsExpectAutoSet = strings.Join(stringx.Remove(agentFieldNames, "`create_time`", "`update_time`"), ",")
|
||||
agentRowsWithPlaceHolder = strings.Join(stringx.Remove(agentFieldNames, "`id`", "`create_time`", "`update_time`"), "=?,") + "=?"
|
||||
|
||||
cacheYccAgentIdPrefix = "cache:ycc:agent:id:"
|
||||
cacheYccAgentUserIdPrefix = "cache:ycc:agent:userId:"
|
||||
cacheYccAgentIdPrefix = "cache:ycc:agent:id:"
|
||||
cacheYccAgentAgentCodePrefix = "cache:ycc:agent:agentCode:"
|
||||
cacheYccAgentUserIdPrefix = "cache:ycc:agent:userId:"
|
||||
)
|
||||
|
||||
type (
|
||||
agentModel interface {
|
||||
Insert(ctx context.Context, session sqlx.Session, data *Agent) (sql.Result, error)
|
||||
FindOne(ctx context.Context, id int64) (*Agent, error)
|
||||
FindOneByUserId(ctx context.Context, userId int64) (*Agent, error)
|
||||
FindOne(ctx context.Context, id string) (*Agent, error)
|
||||
FindOneByAgentCode(ctx context.Context, agentCode int64) (*Agent, error)
|
||||
FindOneByUserId(ctx context.Context, userId string) (*Agent, error)
|
||||
Update(ctx context.Context, session sqlx.Session, data *Agent) (sql.Result, error)
|
||||
UpdateWithVersion(ctx context.Context, session sqlx.Session, data *Agent) error
|
||||
Trans(ctx context.Context, fn func(context context.Context, session sqlx.Session) error) error
|
||||
@@ -48,7 +51,7 @@ type (
|
||||
FindPageListByPageWithTotal(ctx context.Context, rowBuilder squirrel.SelectBuilder, page, pageSize int64, orderBy string) ([]*Agent, int64, error)
|
||||
FindPageListByIdDESC(ctx context.Context, rowBuilder squirrel.SelectBuilder, preMinId, pageSize int64) ([]*Agent, error)
|
||||
FindPageListByIdASC(ctx context.Context, rowBuilder squirrel.SelectBuilder, preMaxId, pageSize int64) ([]*Agent, error)
|
||||
Delete(ctx context.Context, session sqlx.Session, id int64) error
|
||||
Delete(ctx context.Context, session sqlx.Session, id string) error
|
||||
}
|
||||
|
||||
defaultAgentModel struct {
|
||||
@@ -57,18 +60,20 @@ type (
|
||||
}
|
||||
|
||||
Agent struct {
|
||||
Id int64 `db:"id"` // 主键ID
|
||||
UserId int64 `db:"user_id"` // 用户ID
|
||||
Level int64 `db:"level"` // 代理等级:1=普通,2=黄金,3=钻石
|
||||
Region sql.NullString `db:"region"` // 区域(可选)
|
||||
Mobile string `db:"mobile"` // 手机号(加密)
|
||||
WechatId sql.NullString `db:"wechat_id"` // 微信号
|
||||
TeamLeaderId sql.NullInt64 `db:"team_leader_id"` // 团队首领ID(钻石代理的ID,普通/黄金代理指向其团队首领)
|
||||
CreateTime time.Time `db:"create_time"` // 创建时间
|
||||
UpdateTime time.Time `db:"update_time"` // 更新时间
|
||||
DeleteTime sql.NullTime `db:"delete_time"` // 删除时间
|
||||
DelState int64 `db:"del_state"` // 删除状态:0=未删除,1=已删除
|
||||
Version int64 `db:"version"` // 版本号(乐观锁)
|
||||
Id string `db:"id"`
|
||||
UserId string `db:"user_id"`
|
||||
AgentCode int64 `db:"agent_code"` // 代理编码(从16800开始递增)
|
||||
Level int64 `db:"level"` // 代理等级:1=普通,2=黄金,3=钻石
|
||||
Region sql.NullString `db:"region"` // 区域(可选)
|
||||
Mobile string `db:"mobile"` // 手机号(加密)
|
||||
WechatId sql.NullString `db:"wechat_id"` // 微信号
|
||||
TeamLeaderId sql.NullString `db:"team_leader_id"`
|
||||
InviteCodeId sql.NullString `db:"invite_code_id"`
|
||||
CreateTime time.Time `db:"create_time"` // 创建时间
|
||||
UpdateTime time.Time `db:"update_time"` // 更新时间
|
||||
DeleteTime sql.NullTime `db:"delete_time"` // 删除时间
|
||||
DelState int64 `db:"del_state"` // 删除状态:0=未删除,1=已删除
|
||||
Version int64 `db:"version"` // 版本号(乐观锁)
|
||||
}
|
||||
)
|
||||
|
||||
@@ -81,18 +86,36 @@ func newAgentModel(conn sqlx.SqlConn, c cache.CacheConf) *defaultAgentModel {
|
||||
|
||||
func (m *defaultAgentModel) Insert(ctx context.Context, session sqlx.Session, data *Agent) (sql.Result, error) {
|
||||
data.DelState = globalkey.DelStateNo
|
||||
m.insertUUID(data)
|
||||
yccAgentAgentCodeKey := fmt.Sprintf("%s%v", cacheYccAgentAgentCodePrefix, data.AgentCode)
|
||||
yccAgentIdKey := fmt.Sprintf("%s%v", cacheYccAgentIdPrefix, data.Id)
|
||||
yccAgentUserIdKey := fmt.Sprintf("%s%v", cacheYccAgentUserIdPrefix, 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, agentRowsExpectAutoSet)
|
||||
query := fmt.Sprintf("insert into %s (%s) values (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)", m.table, agentRowsExpectAutoSet)
|
||||
if session != nil {
|
||||
return session.ExecCtx(ctx, query, data.UserId, data.Level, data.Region, data.Mobile, data.WechatId, data.TeamLeaderId, data.DeleteTime, data.DelState, data.Version)
|
||||
return session.ExecCtx(ctx, query, data.Id, data.UserId, data.AgentCode, data.Level, data.Region, data.Mobile, data.WechatId, data.TeamLeaderId, data.InviteCodeId, data.DeleteTime, data.DelState, data.Version)
|
||||
}
|
||||
return conn.ExecCtx(ctx, query, data.UserId, data.Level, data.Region, data.Mobile, data.WechatId, data.TeamLeaderId, data.DeleteTime, data.DelState, data.Version)
|
||||
}, yccAgentIdKey, yccAgentUserIdKey)
|
||||
return conn.ExecCtx(ctx, query, data.Id, data.UserId, data.AgentCode, data.Level, data.Region, data.Mobile, data.WechatId, data.TeamLeaderId, data.InviteCodeId, data.DeleteTime, data.DelState, data.Version)
|
||||
}, yccAgentAgentCodeKey, yccAgentIdKey, yccAgentUserIdKey)
|
||||
}
|
||||
func (m *defaultAgentModel) insertUUID(data *Agent) {
|
||||
t := reflect.TypeOf(data).Elem()
|
||||
v := reflect.ValueOf(data).Elem()
|
||||
for i := 0; i < t.NumField(); i++ {
|
||||
sf := t.Field(i)
|
||||
if sf.Tag.Get("db") == "id" {
|
||||
f := v.Field(i)
|
||||
if f.IsValid() && f.CanSet() && f.Kind() == reflect.String {
|
||||
if f.String() == "" {
|
||||
f.SetString(uuid.NewString())
|
||||
}
|
||||
}
|
||||
break
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
func (m *defaultAgentModel) FindOne(ctx context.Context, id int64) (*Agent, error) {
|
||||
func (m *defaultAgentModel) FindOne(ctx context.Context, id string) (*Agent, error) {
|
||||
yccAgentIdKey := fmt.Sprintf("%s%v", cacheYccAgentIdPrefix, id)
|
||||
var resp Agent
|
||||
err := m.QueryRowCtx(ctx, &resp, yccAgentIdKey, func(ctx context.Context, conn sqlx.SqlConn, v interface{}) error {
|
||||
@@ -109,7 +132,27 @@ func (m *defaultAgentModel) FindOne(ctx context.Context, id int64) (*Agent, erro
|
||||
}
|
||||
}
|
||||
|
||||
func (m *defaultAgentModel) FindOneByUserId(ctx context.Context, userId int64) (*Agent, error) {
|
||||
func (m *defaultAgentModel) FindOneByAgentCode(ctx context.Context, agentCode int64) (*Agent, error) {
|
||||
yccAgentAgentCodeKey := fmt.Sprintf("%s%v", cacheYccAgentAgentCodePrefix, agentCode)
|
||||
var resp Agent
|
||||
err := m.QueryRowIndexCtx(ctx, &resp, yccAgentAgentCodeKey, m.formatPrimary, func(ctx context.Context, conn sqlx.SqlConn, v interface{}) (i interface{}, e error) {
|
||||
query := fmt.Sprintf("select %s from %s where `agent_code` = ? and del_state = ? limit 1", agentRows, m.table)
|
||||
if err := conn.QueryRowCtx(ctx, &resp, query, agentCode, 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 *defaultAgentModel) FindOneByUserId(ctx context.Context, userId string) (*Agent, error) {
|
||||
yccAgentUserIdKey := fmt.Sprintf("%s%v", cacheYccAgentUserIdPrefix, userId)
|
||||
var resp Agent
|
||||
err := m.QueryRowIndexCtx(ctx, &resp, yccAgentUserIdKey, m.formatPrimary, func(ctx context.Context, conn sqlx.SqlConn, v interface{}) (i interface{}, e error) {
|
||||
@@ -134,15 +177,16 @@ func (m *defaultAgentModel) Update(ctx context.Context, session sqlx.Session, ne
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
yccAgentAgentCodeKey := fmt.Sprintf("%s%v", cacheYccAgentAgentCodePrefix, data.AgentCode)
|
||||
yccAgentIdKey := fmt.Sprintf("%s%v", cacheYccAgentIdPrefix, data.Id)
|
||||
yccAgentUserIdKey := fmt.Sprintf("%s%v", cacheYccAgentUserIdPrefix, 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, agentRowsWithPlaceHolder)
|
||||
if session != nil {
|
||||
return session.ExecCtx(ctx, query, newData.UserId, newData.Level, newData.Region, newData.Mobile, newData.WechatId, newData.TeamLeaderId, newData.DeleteTime, newData.DelState, newData.Version, newData.Id)
|
||||
return session.ExecCtx(ctx, query, newData.UserId, newData.AgentCode, newData.Level, newData.Region, newData.Mobile, newData.WechatId, newData.TeamLeaderId, newData.InviteCodeId, newData.DeleteTime, newData.DelState, newData.Version, newData.Id)
|
||||
}
|
||||
return conn.ExecCtx(ctx, query, newData.UserId, newData.Level, newData.Region, newData.Mobile, newData.WechatId, newData.TeamLeaderId, newData.DeleteTime, newData.DelState, newData.Version, newData.Id)
|
||||
}, yccAgentIdKey, yccAgentUserIdKey)
|
||||
return conn.ExecCtx(ctx, query, newData.UserId, newData.AgentCode, newData.Level, newData.Region, newData.Mobile, newData.WechatId, newData.TeamLeaderId, newData.InviteCodeId, newData.DeleteTime, newData.DelState, newData.Version, newData.Id)
|
||||
}, yccAgentAgentCodeKey, yccAgentIdKey, yccAgentUserIdKey)
|
||||
}
|
||||
|
||||
func (m *defaultAgentModel) UpdateWithVersion(ctx context.Context, session sqlx.Session, newData *Agent) error {
|
||||
@@ -157,15 +201,16 @@ func (m *defaultAgentModel) UpdateWithVersion(ctx context.Context, session sqlx.
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
yccAgentAgentCodeKey := fmt.Sprintf("%s%v", cacheYccAgentAgentCodePrefix, data.AgentCode)
|
||||
yccAgentIdKey := fmt.Sprintf("%s%v", cacheYccAgentIdPrefix, data.Id)
|
||||
yccAgentUserIdKey := fmt.Sprintf("%s%v", cacheYccAgentUserIdPrefix, 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, agentRowsWithPlaceHolder)
|
||||
if session != nil {
|
||||
return session.ExecCtx(ctx, query, newData.UserId, newData.Level, newData.Region, newData.Mobile, newData.WechatId, newData.TeamLeaderId, newData.DeleteTime, newData.DelState, newData.Version, newData.Id, oldVersion)
|
||||
return session.ExecCtx(ctx, query, newData.UserId, newData.AgentCode, newData.Level, newData.Region, newData.Mobile, newData.WechatId, newData.TeamLeaderId, newData.InviteCodeId, newData.DeleteTime, newData.DelState, newData.Version, newData.Id, oldVersion)
|
||||
}
|
||||
return conn.ExecCtx(ctx, query, newData.UserId, newData.Level, newData.Region, newData.Mobile, newData.WechatId, newData.TeamLeaderId, newData.DeleteTime, newData.DelState, newData.Version, newData.Id, oldVersion)
|
||||
}, yccAgentIdKey, yccAgentUserIdKey)
|
||||
return conn.ExecCtx(ctx, query, newData.UserId, newData.AgentCode, newData.Level, newData.Region, newData.Mobile, newData.WechatId, newData.TeamLeaderId, newData.InviteCodeId, newData.DeleteTime, newData.DelState, newData.Version, newData.Id, oldVersion)
|
||||
}, yccAgentAgentCodeKey, yccAgentIdKey, yccAgentUserIdKey)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
@@ -382,12 +427,13 @@ func (m *defaultAgentModel) Trans(ctx context.Context, fn func(ctx context.Conte
|
||||
func (m *defaultAgentModel) SelectBuilder() squirrel.SelectBuilder {
|
||||
return squirrel.Select().From(m.table)
|
||||
}
|
||||
func (m *defaultAgentModel) Delete(ctx context.Context, session sqlx.Session, id int64) error {
|
||||
func (m *defaultAgentModel) Delete(ctx context.Context, session sqlx.Session, id string) error {
|
||||
data, err := m.FindOne(ctx, id)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
|
||||
yccAgentAgentCodeKey := fmt.Sprintf("%s%v", cacheYccAgentAgentCodePrefix, data.AgentCode)
|
||||
yccAgentIdKey := fmt.Sprintf("%s%v", cacheYccAgentIdPrefix, id)
|
||||
yccAgentUserIdKey := fmt.Sprintf("%s%v", cacheYccAgentUserIdPrefix, data.UserId)
|
||||
_, err = m.ExecCtx(ctx, func(ctx context.Context, conn sqlx.SqlConn) (result sql.Result, err error) {
|
||||
@@ -396,7 +442,7 @@ func (m *defaultAgentModel) Delete(ctx context.Context, session sqlx.Session, id
|
||||
return session.ExecCtx(ctx, query, id)
|
||||
}
|
||||
return conn.ExecCtx(ctx, query, id)
|
||||
}, yccAgentIdKey, yccAgentUserIdKey)
|
||||
}, yccAgentAgentCodeKey, yccAgentIdKey, yccAgentUserIdKey)
|
||||
return err
|
||||
}
|
||||
func (m *defaultAgentModel) formatPrimary(primary interface{}) string {
|
||||
|
||||
Reference in New Issue
Block a user