Compare commits
No commits in common. "79e207ebf95e1314b5596a83d10d27772bfa9c26" and "c845dcad4e18b51d0f9bdbaa6a4e9b2c86b488a7" have entirely different histories.
79e207ebf9
...
c845dcad4e
|
@ -700,7 +700,6 @@ const (
|
||||||
InviteScoreTypeBind = 1 // 绑定邀请码
|
InviteScoreTypeBind = 1 // 绑定邀请码
|
||||||
InviteScoreTypePay = 2 // 充值
|
InviteScoreTypePay = 2 // 充值
|
||||||
InviteScoreTypeRecharge = 3 // 充值完成
|
InviteScoreTypeRecharge = 3 // 充值完成
|
||||||
InviteScoreTypePayMe = 4 // 充值(给自己)
|
|
||||||
)
|
)
|
||||||
|
|
||||||
func InMatchChannel(ls []string, n string) bool {
|
func InMatchChannel(ls []string, n string) bool {
|
||||||
|
|
|
@ -169,7 +169,6 @@ func init() {
|
||||||
|
|
||||||
case common.InviteScoreTypePay:
|
case common.InviteScoreTypePay:
|
||||||
// 更新充值积分,上级积分增加
|
// 更新充值积分,上级积分增加
|
||||||
add(log.SnId, log.Score, 0, 10000)
|
|
||||||
var psnid int32
|
var psnid int32
|
||||||
if len(log.Rate) > 0 {
|
if len(log.Rate) > 0 {
|
||||||
add(log.InviteSnId, log.Score, log.Money, log.Rate[0])
|
add(log.InviteSnId, log.Score, log.Money, log.Rate[0])
|
||||||
|
|
|
@ -102,22 +102,6 @@ func SaveInviteScore(req *model.InviteScore, rechargeScore int64) (b bool, err e
|
||||||
logger.Logger.Errorf("SaveInviteScore Insert 1 error:%v", err)
|
logger.Logger.Errorf("SaveInviteScore Insert 1 error:%v", err)
|
||||||
return false, err
|
return false, err
|
||||||
}
|
}
|
||||||
// 自己加积分
|
|
||||||
err = c.Insert(&model.InviteScore{
|
|
||||||
Id: bson.NewObjectId(),
|
|
||||||
Platform: req.Platform,
|
|
||||||
SnId: req.SnId,
|
|
||||||
InviteSnId: req.InviteSnId,
|
|
||||||
Tp: common.InviteScoreTypePayMe,
|
|
||||||
Score: req.Score,
|
|
||||||
Ts: req.Ts,
|
|
||||||
Money: req.Money,
|
|
||||||
Rate: req.Rate,
|
|
||||||
})
|
|
||||||
if err != nil {
|
|
||||||
logger.Logger.Errorf("SaveInviteScore Insert me error:%v", err)
|
|
||||||
return false, err
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
// 没有充值成功记录
|
// 没有充值成功记录
|
||||||
|
@ -126,25 +110,6 @@ func SaveInviteScore(req *model.InviteScore, rechargeScore int64) (b bool, err e
|
||||||
logger.Logger.Errorf("SaveInviteScore Insert 2 error:%v", err)
|
logger.Logger.Errorf("SaveInviteScore Insert 2 error:%v", err)
|
||||||
return false, err
|
return false, err
|
||||||
}
|
}
|
||||||
if req.Tp == common.InviteScoreTypePay {
|
|
||||||
// 自己加积分
|
|
||||||
err = c.Insert(&model.InviteScore{
|
|
||||||
Id: bson.NewObjectId(),
|
|
||||||
Platform: req.Platform,
|
|
||||||
SnId: req.SnId,
|
|
||||||
InviteSnId: req.InviteSnId,
|
|
||||||
Tp: common.InviteScoreTypePayMe,
|
|
||||||
Score: req.Score,
|
|
||||||
Ts: req.Ts,
|
|
||||||
Money: req.Money,
|
|
||||||
Rate: req.Rate,
|
|
||||||
})
|
|
||||||
if err != nil {
|
|
||||||
logger.Logger.Errorf("SaveInviteScore Insert me 2 error:%v", err)
|
|
||||||
return false, err
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
newReq := *req
|
newReq := *req
|
||||||
if newReq.Tp != common.InviteScoreTypeRecharge {
|
if newReq.Tp != common.InviteScoreTypeRecharge {
|
||||||
newReq.Id = bson.NewObjectId()
|
newReq.Id = bson.NewObjectId()
|
||||||
|
|
|
@ -1063,7 +1063,7 @@ func (this *WelfareMgr) BlindBoxInfo(p *Player, bid int32) {
|
||||||
if cyc == 1 || blindBox.Cycle == model.WelfareOpen {
|
if cyc == 1 || blindBox.Cycle == model.WelfareOpen {
|
||||||
p.WelfData.BlindBoxId = 0
|
p.WelfData.BlindBoxId = 0
|
||||||
}
|
}
|
||||||
} // == 1代表当日循环
|
} // == 1代表当日循环
|
||||||
if p.WelfData.BlindBoxId == 0 { // 未领取过发随机Date
|
if p.WelfData.BlindBoxId == 0 { // 未领取过发随机Date
|
||||||
|
|
||||||
idx := bid
|
idx := bid
|
||||||
|
|
Loading…
Reference in New Issue