Sfoglia il codice sorgente

端口账号类型更新2

wangbin 3 anni fa
parent
commit
df9a04c83e
1 ha cambiato i file con 11 aggiunte e 6 eliminazioni
  1. 11 6
      service/task/game_task.go

+ 11 - 6
service/task/game_task.go

@@ -932,6 +932,8 @@ func (s *GameTask) TargetStatistics(date string) (apiList []control.TargetStatis
 	var taskTarget []control.GetTargetStatisticsReply
 	err = db.Order("gtc.id desc").Find(&taskTarget).Error
 	if len(taskTarget) != 0 {
+		loginType, _ := s.loginType.GetLoginTypeData()
+		gameChannel, _ := s.gameChannel.GetGameChannelData()
 		for _, target := range taskTarget {
 			var targetStatistics control.TargetStatisticsReply
 			targetStatistics.TaskId = target.TaskId
@@ -948,8 +950,8 @@ func (s *GameTask) TargetStatistics(date string) (apiList []control.TargetStatis
 			targetStatistics.QqChannel = target.TxChannel
 			targetStatistics.MeiZuGameId = target.MzGameId
 			targetStatistics.MeiZuChannel = target.MzChannel
-			targetStatistics.LoginMode = LoginMethod[target.LoginMethod]
-			targetStatistics.GamePort = GamePort[target.GamePortId]
+			targetStatistics.LoginMode = loginType[int64(target.LoginMethod)].LoginName
+			targetStatistics.GamePort = gameChannel[int64(target.GamePortId)].ChannelName
 			targetStatistics.GameDirector = target.User
 			targetStatistics.GameId = target.GameId
 			targetStatistics.GameName = target.GameName
@@ -961,6 +963,7 @@ func (s *GameTask) TargetStatistics(date string) (apiList []control.TargetStatis
 
 func (s *GameTask) DayStatisticsData(request request.GameTaskStatisticsRequest) (gameTargetDates []response.GameTargetStatistics, err error) {
 	createDate := time.Now().Format("2006-01-02")
+	gameChannel, _ := s.gameChannel.GetGameChannelData()
 	if request.Date == "" || request.Date == createDate {
 		request.Date = time.Now().Format("2006-01-02")
 		gameTargets, err := s.EveryDayTargetData(request.Date, request)
@@ -976,7 +979,7 @@ func (s *GameTask) DayStatisticsData(request request.GameTaskStatisticsRequest)
 			gameTargetDate.NewComplete = gameTarget.NewComplete
 			gameTargetDate.RetainedComplete = gameTarget.RetainedComplete
 			gameTargetDate.Amount = gameTarget.Amount
-			gameTargetDate.GamePort = GamePort[gameTarget.GamePortId]
+			gameTargetDate.GamePort = gameChannel[int64(gameTarget.GamePortId)].ChannelName
 			gameTargetDate.User = gameTarget.User
 			gameTargetDate.TaskDate = gameTarget.CreateDate.Format("2006-01-02")
 			gameTargetDates = append(gameTargetDates, gameTargetDate)
@@ -997,7 +1000,7 @@ func (s *GameTask) DayStatisticsData(request request.GameTaskStatisticsRequest)
 			gameTargetDate.RetainedComplete = gameTarget.RetainedComplete
 			gameTargetDate.Amount = gameTarget.Amount
 			gameTargetDate.TaskDate = gameTarget.TaskDate.Format("2006-01-02")
-			gameTargetDate.GamePort = GamePort[gameTarget.GamePortId]
+			gameTargetDate.GamePort = gameChannel[int64(gameTarget.GamePortId)].ChannelName
 			gameTargetDate.User = gameTarget.User
 			gameTargetDates = append(gameTargetDates, gameTargetDate)
 		}
@@ -1054,8 +1057,9 @@ func (s *GameTask) GameStatisticsData(date string) (gameTarget []response.GameSt
 	if err != nil {
 		return nil, err
 	}
+	gameChannel, _ := s.gameChannel.GetGameChannelData()
 	for i, target := range gameTarget {
-		gameTarget[i].GamePort = GamePort[target.GamePortId]
+		gameTarget[i].GamePort = gameChannel[int64(target.GamePortId)].ChannelName
 		gameTarget[i].CreateDate = date
 	}
 	return
@@ -1075,8 +1079,9 @@ func (s *GameTask) GameStatisticsList(rq request.GameListRequest) (gameTarget []
 	if err != nil {
 		return nil, err
 	}
+	gameChannel, _ := s.gameChannel.GetGameChannelData()
 	for i, target := range gameTarget {
-		gameTarget[i].GamePort = GamePort[target.GamePortId]
+		gameTarget[i].GamePort = gameChannel[int64(target.GamePortId)].ChannelName
 		gameTarget[i].CreateDate = rq.Date
 	}
 	return