优化账号表
This commit is contained in:
parent
7ecebe62e6
commit
3a5039727b
|
@ -480,22 +480,22 @@ func (svc *AccountSvc) EditAccountPwd(acc *model.Account, ret *model.AccRet) err
|
|||
return caccounts.Update(bson.M{"_id": acc.AccountId}, bson.D{{"$set", bson.D{{"backpassword", acc.TelPassWord}, {"telpassword", hashsum}}}})
|
||||
}
|
||||
|
||||
func (svc *AccountSvc) ResetBackAccountPwd(args *model.AccIdArg, ret *model.AccRet) error {
|
||||
caccounts := AccountCollection(args.Platform)
|
||||
if caccounts == nil {
|
||||
return ErrAccDBNotOpen
|
||||
}
|
||||
|
||||
var acc model.Account
|
||||
err := caccounts.Find(bson.M{"_id": bson.ObjectIdHex(args.AccId)}).One(&acc)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
if len(acc.BackPassWord) > 0 {
|
||||
return caccounts.Update(bson.M{"_id": acc.AccountId}, bson.D{{"$set", bson.D{{"telpassword", acc.BackPassWord}}}})
|
||||
}
|
||||
return nil
|
||||
}
|
||||
//func (svc *AccountSvc) ResetBackAccountPwd(args *model.AccIdArg, ret *model.AccRet) error {
|
||||
// caccounts := AccountCollection(args.Platform)
|
||||
// if caccounts == nil {
|
||||
// return ErrAccDBNotOpen
|
||||
// }
|
||||
//
|
||||
// var acc model.Account
|
||||
// err := caccounts.Find(bson.M{"_id": bson.ObjectIdHex(args.AccId)}).One(&acc)
|
||||
// if err != nil {
|
||||
// return err
|
||||
// }
|
||||
// if len(acc.BackPassWord) > 0 {
|
||||
// return caccounts.Update(bson.M{"_id": acc.AccountId}, bson.D{{"$set", bson.D{{"telpassword", acc.BackPassWord}}}})
|
||||
// }
|
||||
// return nil
|
||||
//}
|
||||
|
||||
/*
|
||||
* 修改帐号密码
|
||||
|
@ -540,7 +540,7 @@ func (svc *AccountSvc) UpdateAccountPlatformInfo(acc *model.Account, ret *model.
|
|||
|
||||
return caccounts.Update(bson.M{"_id": acc.AccountId},
|
||||
bson.D{{"$set", bson.M{"platform": acc.Platform,
|
||||
"channel": acc.Channel, "promoter": acc.Promoter, "inviterid": acc.InviterId, "packegetag": acc.PackegeTag, "promotertree": acc.PromoterTree}}})
|
||||
"channel": acc.Channel, "packegetag": acc.PackegeTag}}})
|
||||
}
|
||||
|
||||
func (svc *AccountSvc) GetRobotAccounts(limit int, accs *[]model.Account) error {
|
||||
|
|
|
@ -147,8 +147,8 @@ func (svc *PlayerDataSvc) GetPlayerData(args *model.GetPlayerDataArgs, ret *mode
|
|||
name = "Guest"
|
||||
}
|
||||
|
||||
pd = model.NewPlayerData(args.Acc, name, id, a.Channel, a.Platform, a.Promoter, a.InviterId, a.PromoterTree, a.Params,
|
||||
a.Tel, a.PackegeTag, dataParams.Ip, 0, dataParams.UnionId, a.DeviceInfo, a.SubPromoter, a.TagKey, a.AccountType)
|
||||
pd = model.NewPlayerData(args.Acc, name, id, a.Channel, a.Platform, a.Params,
|
||||
a.Tel, a.PackegeTag, dataParams.Ip, 0, dataParams.UnionId, a.DeviceInfo, a.TagKey, a.AccountType)
|
||||
if pd != nil {
|
||||
err = cplayerdata.Insert(pd)
|
||||
if err != nil {
|
||||
|
@ -222,8 +222,8 @@ func (svc *PlayerDataSvc) CreatePlayerDataByThird(args *model.CreatePlayer, ret
|
|||
}
|
||||
var dataParams model.PlayerParams
|
||||
json.Unmarshal([]byte(a.Params), &dataParams)
|
||||
pd = model.NewPlayerDataThird(acc, name, args.HeadUrl, id, a.Channel, a.Platform, a.Promoter, a.InviterId,
|
||||
a.PromoterTree, a.Params, a.Tel, a.PackegeTag, dataParams.Ip, a.SubPromoter, a.TagKey, a.AccountType, a.DeviceOs)
|
||||
pd = model.NewPlayerDataThird(acc, name, args.HeadUrl, id, a.Channel, a.Platform, a.Params,
|
||||
a.Tel, a.PackegeTag, dataParams.Ip, a.TagKey, a.AccountType, a.DeviceOs)
|
||||
if pd != nil {
|
||||
err = cplayerdata.Insert(pd)
|
||||
if err != nil {
|
||||
|
@ -292,9 +292,8 @@ func (svc *PlayerDataSvc) CreatePlayerDataOnRegister(args *model.PlayerDataArg,
|
|||
}
|
||||
var dataParams model.PlayerParams
|
||||
json.Unmarshal([]byte(a.Params), &dataParams)
|
||||
pd = model.NewPlayerData(acc, name, id, a.Channel, a.Platform, a.Promoter, a.InviterId,
|
||||
a.PromoterTree, a.Params, a.Tel, a.PackegeTag, dataParams.Ip, int64(args.AddCoin),
|
||||
"", a.DeviceInfo, a.SubPromoter, a.TagKey, a.AccountType)
|
||||
pd = model.NewPlayerData(acc, name, id, a.Channel, a.Platform, a.Params, a.Tel, a.PackegeTag,
|
||||
dataParams.Ip, int64(args.AddCoin), "", a.DeviceInfo, a.TagKey, a.AccountType)
|
||||
pd.HeadUrl = args.HeadUrl
|
||||
if pd != nil {
|
||||
err = cplayerdata.Insert(pd)
|
||||
|
@ -342,8 +341,8 @@ func (svc *PlayerDataSvc) GetPlayerDataBySnId(args *model.GetPlayerDataBySnIdArg
|
|||
name = "Guest"
|
||||
}
|
||||
|
||||
pd := model.NewPlayerData(a.AccountId.Hex(), name, a.SnId, a.Channel, a.Platform, a.Promoter, a.InviterId, a.PromoterTree, a.Params,
|
||||
a.Tel, a.PackegeTag, dataParams.Ip, 0, dataParams.UnionId, a.DeviceInfo, a.SubPromoter, a.TagKey, a.AccountType)
|
||||
pd := model.NewPlayerData(a.AccountId.Hex(), name, a.SnId, a.Channel, a.Platform, a.Params,
|
||||
a.Tel, a.PackegeTag, dataParams.Ip, 0, dataParams.UnionId, a.DeviceInfo, a.TagKey, a.AccountType)
|
||||
if pd != nil {
|
||||
err = cplayerdata.Insert(pd)
|
||||
if err != nil {
|
||||
|
|
|
@ -23,13 +23,8 @@ type Account struct {
|
|||
PassWord string //昵称密码
|
||||
TelPassWord string //帐号密码
|
||||
BackPassWord string //备份账号密码
|
||||
//VIP int32 //VIP帐号 等级
|
||||
Platform string //平台
|
||||
Channel string //渠道
|
||||
Promoter string //推广员
|
||||
SubPromoter string //子推广员
|
||||
InviterId int32 //邀请人ID
|
||||
PromoterTree int32 //推广树ID
|
||||
Tel string //电话号码
|
||||
Params string //其他参数
|
||||
DeviceOs string //系统
|
||||
|
@ -128,11 +123,7 @@ func InsertAccount(userName, passWord, platform, channel, promoter, params, devi
|
|||
acc.Platform = platform
|
||||
acc.Channel = channel
|
||||
acc.Params = params
|
||||
acc.SubPromoter = subPromoter
|
||||
acc.DeviceOs = deviceOs
|
||||
acc.Promoter = promoter
|
||||
acc.InviterId = inviterId
|
||||
acc.PromoterTree = promoterTree
|
||||
acc.LastLoginTime = tCur
|
||||
acc.RegisteTime = tCur
|
||||
acc.LoginTimes = 1
|
||||
|
@ -166,10 +157,7 @@ func InsertTelAccount(userName, passWord, platform, channel, promoter, params st
|
|||
acc.TelPassWord = telpassword
|
||||
acc.Platform = platform
|
||||
acc.Channel = channel
|
||||
acc.Promoter = promoter
|
||||
acc.Params = params
|
||||
acc.InviterId = inviterId
|
||||
acc.PromoterTree = promoterTree
|
||||
acc.LastLoginTime = tCur
|
||||
acc.RegisteTime = tCur
|
||||
acc.LoginTimes = 1
|
||||
|
@ -496,9 +484,6 @@ func UpdateAccountPlatformInfo(account string, platform, channel, promoter, invi
|
|||
AccountId: bson.ObjectIdHex(account),
|
||||
Platform: strconv.Itoa(int(platform)),
|
||||
Channel: strconv.Itoa(int(channel)),
|
||||
Promoter: strconv.Itoa(int(promoter)),
|
||||
PromoterTree: promoterTree,
|
||||
InviterId: inviterid,
|
||||
PackegeTag: packTag,
|
||||
}
|
||||
ret := &AccRet{}
|
||||
|
|
|
@ -709,9 +709,9 @@ func (this *PlayerData) GetPlayerDataEncoder() (bytes.Buffer, error) {
|
|||
return buf, err
|
||||
}
|
||||
|
||||
func NewPlayerData(acc string, name string, id int32, channel, platform, promoter string, inviterId,
|
||||
promoterTree int32, params, tel string, packTag, ip string, addCoin int64, unionid, deviceInfo string,
|
||||
subPromoter string, tagkey, accountType int32) *PlayerData {
|
||||
func NewPlayerData(acc string, name string, id int32, channel, platform string, params, tel string,
|
||||
packTag, ip string, addCoin int64, unionid, deviceInfo string,
|
||||
tagkey, accountType int32) *PlayerData {
|
||||
if len(name) == 0 {
|
||||
logger.Logger.Trace("New player name is empty.")
|
||||
return nil
|
||||
|
@ -733,16 +733,12 @@ func NewPlayerData(acc string, name string, id int32, channel, platform, promote
|
|||
Channel: channel,
|
||||
Platform: platform,
|
||||
SnId: id,
|
||||
InviterId: inviterId,
|
||||
PromoterTree: promoterTree,
|
||||
Head: rand.Int31n(common.HeadRange),
|
||||
//Coin: int64(GameParamData.NewPlayerCoin) + addCoin,
|
||||
SafeBoxPassword: pwd,
|
||||
Ip: ip,
|
||||
RegIp: ip,
|
||||
Params: params,
|
||||
Tel: tel,
|
||||
SubBeUnderAgentCode: subPromoter,
|
||||
AgentType: 0,
|
||||
LastLoginTime: tNow.Local(),
|
||||
LastLogoutTime: tNow.AddDate(0, 0, -1).Local(),
|
||||
|
@ -753,7 +749,6 @@ func NewPlayerData(acc string, name string, id int32, channel, platform, promote
|
|||
CoinPayTotal: 0,
|
||||
MoneyPayTotal: 0,
|
||||
IsRob: isRobot,
|
||||
BeUnderAgentCode: promoter,
|
||||
PackageID: packTag,
|
||||
WBLevel: 0,
|
||||
WBCoinTotalOut: 0,
|
||||
|
@ -781,8 +776,8 @@ func NewPlayerData(acc string, name string, id int32, channel, platform, promote
|
|||
return pd
|
||||
}
|
||||
|
||||
func NewPlayerDataThird(acc string, name, headUrl string, id int32, channel, platform, promoter string, inviterId,
|
||||
promoterTree int32, params, tel string, packTag, ip string, subPromoter string, tagkey, accountType int32, deviceOS string) *PlayerData {
|
||||
func NewPlayerDataThird(acc string, name, headUrl string, id int32, channel, platform string, params, tel string,
|
||||
packTag, ip string, tagkey, accountType int32, deviceOS string) *PlayerData {
|
||||
if len(name) == 0 {
|
||||
logger.Logger.Trace("New player name is empty.")
|
||||
return nil
|
||||
|
@ -795,8 +790,6 @@ func NewPlayerDataThird(acc string, name, headUrl string, id int32, channel, pla
|
|||
Channel: channel,
|
||||
Platform: platform,
|
||||
SnId: id,
|
||||
InviterId: inviterId,
|
||||
PromoterTree: promoterTree,
|
||||
Head: rand.Int31n(common.HeadRange),
|
||||
HeadUrl: headUrl,
|
||||
//Coin: int64(GameParamData.NewPlayerCoin),
|
||||
|
@ -804,14 +797,12 @@ func NewPlayerDataThird(acc string, name, headUrl string, id int32, channel, pla
|
|||
RegIp: ip,
|
||||
Params: params,
|
||||
Tel: tel,
|
||||
SubBeUnderAgentCode: subPromoter,
|
||||
LastLoginTime: tNow.Local(),
|
||||
LastLogoutTime: tNow.AddDate(0, 0, -1).Local(),
|
||||
CreateTime: tNow.Local(),
|
||||
Ver: VER_PLAYER_MAX - 1,
|
||||
HeadOutLine: 1,
|
||||
IsRob: false,
|
||||
BeUnderAgentCode: promoter,
|
||||
PackageID: packTag,
|
||||
YesterdayGameData: NewPlayerGameCtrlData(),
|
||||
TodayGameData: NewPlayerGameCtrlData(),
|
||||
|
|
Loading…
Reference in New Issue