Merge branch 'develop' into release

dbproxy/svc/l_invitescore.go

@@ -46,7 +46,7 @@ type BindScoreSvc struct {
 
 func CheckInviteScore(req *model.InviteScore) (b bool, err error) {
 	logger.Logger.Tracef("SaveInviteScore req:%+v", *req)
-	if req.InviteSnId == 0 || req.SnId == 0 {
+	if req.SnId == 0 {
 		return false, nil
 	}
 
@@ -75,7 +75,7 @@ func CheckInviteScore(req *model.InviteScore) (b bool, err error) {
 	}
 
 	// 充值成功记录
-	if req.Tp == common.InviteScoreTypePay || req.Tp == common.InviteScoreTypeRecharge {
+	if (req.Tp == common.InviteScoreTypePay || req.Tp == common.InviteScoreTypeRecharge) && req.InviteSnId > 0 {
 		// 是否已经记录过
 		c := InviteScoreCollection(req.Platform)
 		if c == nil {

worldsrv/player.go

@@ -4383,7 +4383,7 @@ func (this *Player) PhoneLotteryTask(taskId int32, num int64) {
 }
 
 func InviteTask(platform string, psnid, snid, scoreType int32, n int64) {
-	if psnid <= 0 || snid <= 0 {
+	if snid <= 0 {
 		return
 	}
 	cfg := PlatformMgrSingleton.GetConfig(platform).ActInviteConfig