update 任务相关调整;玩家信息调整

game/game_cluster/nodes/webadmin/entity/admin.go

@@ -130,8 +130,7 @@ type PlayerInfoResp struct {
 	MaxSuccessions int                  `json:"maxSuccessions" bson:"maxSuccessions"` // 最大连续等级天数
 	PrevTime       int64                `json:"prevTime" bson:"prevTime"`             // 上次登陆时间
 	UpdateTime     int64                `json:"updateTime" bson:"updateTime"`         // 更新时间
-	IsDrawShare    int                  `json:"isDrawShare" bson:"isDrawShare"`       // 0未领取，1已领取
-	DrawShareTime  int64                `json:"drawShareTime" bson:"drawShareTime"`   // 领取时间
+	Share          *models.Share        `json:"share" bson:"share"`                   // 分享
 	FirstReward    int                  `json:"firstReward" bson:"firstReward"`       // 是否已领取首次登陆奖励
 	Item           models.ItemBasePack  `json:"item" bson:"item"`                     // 道具
 	SinIn          models.SignIn        `json:"sinIn" bson:"sinIn"`                   // 签到

game/game_cluster/nodes/webadmin/service/playerMange.go

@@ -451,6 +451,28 @@ func (a *PlayerManage) GetPlayerLastestDiceRecord(userName string) (*eventmodels
 	return diceRecord, nil
 }
 
+// 获取用户任务的最新记录
+func (a *PlayerManage) GetLastestTaskInfo(userName, taskId string) (*eventmodels.TaskFinishEventContent, *code.Result) {
+	taskRecord := &eventmodels.TaskFinishEventContent{}
+	where := &eventmodels.TaskFinishEventContent{
+		UserBasic: eventmodels.UserBasic{
+			UserId: userName,
+		},
+		TaskId: taskId,
+	}
+	err := mdb.LogstashDB.Model(&eventmodels.TaskFinishEventContent{}).Where(where).Order("create_at desc").First(&taskRecord).Error
+	if err != nil && err != gorm.ErrRecordNotFound {
+		mhayaLogger.Warnf("GetLastestTaskInfo First error:%v", err)
+		return nil, common.NewResult(code.InternalError)
+	}
+
+	if err == gorm.ErrRecordNotFound {
+		return nil, nil
+	}
+
+	return taskRecord, nil
+}
+
 // 获取玩家详情
 func (a *PlayerManage) PlayerInfo(ctx context.Context, req entity.PlayerInfoReq) (*entity.PlayerInfoResp, *code.Result) {
 	registerRecord, codeResult := a.GetPlayerRegisterRecord(req.UserName)
@@ -658,10 +680,17 @@ func (a *PlayerManage) PlayerInfo(ctx context.Context, req entity.PlayerInfoReq)
 
 			return 0
 		}(),
-		IsDrawShare:   0, // TODO
-		DrawShareTime: 0, // TODO
-		FirstReward:   0, // TODO
 		// TODO 其他玩家信息
+		Share:       nil,
+		FirstReward: 0,
+		// Item:,
+		// SinIn:,
+		// DailyTask:,
+		// AchieveTask:,
+		// RankReward:,
+		// Invite:,
+		// InviteReward:,
+		// Roll:,
 	}, nil
 }
 

game/game_cluster/nodes/webadmin/service/synthesis.go

@@ -2,6 +2,7 @@ package service
 
 import (
 	"context"
+	"fmt"
 	"math"
 	"sort"
 	"time"
@@ -1422,6 +1423,15 @@ func (s *Synthesis) getTaskCompletionDetail(userName string) (*entity.TaskComple
 		return nil, nil
 	}
 
+	// TODO 需要定义或者传入taskid
+	record, codeResult := playerMgr.GetLastestTaskInfo(userName, "taskId")
+	if codeResult != nil {
+		mhayaLogger.Warnf("getTaskCompletionDetail GetLastestTaskInfo error:%v", codeResult)
+		return nil, codeResult
+	}
+	fmt.Println(record)
+
+	// TODO 需要设置taskid
 	// 获取用户加入频道的记录
 	joinTgRecord, codeResult := playerMgr.GetJoinRecord(userName, string(constant.TGJoinName))
 	if codeResult != nil {
@@ -1429,12 +1439,14 @@ func (s *Synthesis) getTaskCompletionDetail(userName string) (*entity.TaskComple
 		return nil, codeResult
 	}
 
+	// TODO 需要设置taskid
 	joinDcRecord, codeResult := playerMgr.GetJoinRecord(userName, string(constant.DCJoinName))
 	if codeResult != nil {
 		mhayaLogger.Warnf("getTaskCompletionDetail GetJoinRecord error:%v", codeResult)
 		return nil, codeResult
 	}
 
+	// TODO 需要设置taskid
 	// 获取用户关注的记录
 	followTwitterRecord, codeResult := playerMgr.GetFollowRecord(userName, string(constant.TwitterFollowName))
 	if codeResult != nil {
@@ -1442,12 +1454,14 @@ func (s *Synthesis) getTaskCompletionDetail(userName string) (*entity.TaskComple
 		return nil, codeResult
 	}
 
+	// TODO 需要设置taskid
 	followYoutubeRecord, codeResult := playerMgr.GetFollowRecord(userName, string(constant.YoutubeFollowName))
 	if codeResult != nil {
 		mhayaLogger.Warnf("getTaskCompletionDetail GetFollowRecord error:%v", codeResult)
 		return nil, codeResult
 	}
 
+	// TODO 需要设置taskid
 	// 获取最新的用户信息更新记录
 	updateRecord, codeResult := playerMgr.GetPlayerLastestUpdateRecord(userName)
 	if codeResult != nil {
@@ -1455,6 +1469,7 @@ func (s *Synthesis) getTaskCompletionDetail(userName string) (*entity.TaskComple
 		return nil, codeResult
 	}
 
+	// TODO 需要设置taskid
 	// 邀请成功人数
 	inviteCount, codeResult := playerMgr.GetSuccessfulInvitations(userName, 0)
 	if codeResult != nil {