Skip to content

N
nbya
Commit 66c597d7 authored by haoyanbin's avatar haoyanbin
Browse files
Options

log

parent 8ac1a09e
Hide whitespace changes
Inline Side-by-side
Showing with 45 additions and 9 deletions
app/mobile/apis/org_news.go
View file @ 66c597d7
...@@ -54,6 +54,7 @@ func (e OrgNews) GetPage(c *gin.Context) { ...@@ -54,6 +54,7 @@ func (e OrgNews) GetPage(c *gin.Context) {
err = sOrgAd.GetPage(&reqOrgAd, p, &listOrgAd, &countOrgAd) err = sOrgAd.GetPage(&reqOrgAd, p, &listOrgAd, &countOrgAd)
if err != nil { if err != nil {
e.Logger.Error(err)
e.Error(109, err, "未获取到数据") e.Error(109, err, "未获取到数据")
return return
} }
...@@ -63,6 +64,7 @@ func (e OrgNews) GetPage(c *gin.Context) { ...@@ -63,6 +64,7 @@ func (e OrgNews) GetPage(c *gin.Context) {
err = s.GetPage(&req, p, &list, &count) err = s.GetPage(&req, p, &list, &count)
if err != nil { if err != nil {
e.Logger.Error(err)
e.Error(109, err, "未获取到数据") e.Error(109, err, "未获取到数据")
return return
} }
...@@ -99,6 +101,7 @@ func (e OrgNews) Get(c *gin.Context) { ...@@ -99,6 +101,7 @@ func (e OrgNews) Get(c *gin.Context) {
p := actions.GetPermissionFromContext(c) p := actions.GetPermissionFromContext(c)
err = s.Get(&req, p, &object) err = s.Get(&req, p, &object)
if err != nil { if err != nil {
e.Logger.Error(err)
e.Error(109, err, "未获取到数据") e.Error(109, err, "未获取到数据")
return return
} }
......
app/mobile/apis/org_player.go
View file @ 66c597d7
...@@ -48,6 +48,7 @@ func (e OrgPlayer) GetPage(c *gin.Context) { ...@@ -48,6 +48,7 @@ func (e OrgPlayer) GetPage(c *gin.Context) {
err = s.GetPage(&req, p, &list, &count) err = s.GetPage(&req, p, &list, &count)
if err != nil { if err != nil {
e.Logger.Error(err)
e.Error(109, err, "未获取到数据") e.Error(109, err, "未获取到数据")
return return
} }
...@@ -82,6 +83,7 @@ func (e OrgPlayer) Get(c *gin.Context) { ...@@ -82,6 +83,7 @@ func (e OrgPlayer) Get(c *gin.Context) {
p := actions.GetPermissionFromContext(c) p := actions.GetPermissionFromContext(c)
err = s.Get(&req, p, &object) err = s.Get(&req, p, &object)
if err != nil { if err != nil {
e.Logger.Error(err)
e.Error(109, err, "未获取到数据") e.Error(109, err, "未获取到数据")
return return
} }
...@@ -153,6 +155,7 @@ func (e OrgPlayer) GetInfo(c *gin.Context) { ...@@ -153,6 +155,7 @@ func (e OrgPlayer) GetInfo(c *gin.Context) {
p := actions.GetPermissionFromContext(c) p := actions.GetPermissionFromContext(c)
err = s.Get(&reqGet, p, &object) err = s.Get(&reqGet, p, &object)
if err != nil { if err != nil {
e.Logger.Error(err)
e.Error(109, err, "未获取到数据") e.Error(109, err, "未获取到数据")
return return
} }
...@@ -160,7 +163,8 @@ func (e OrgPlayer) GetInfo(c *gin.Context) { ...@@ -160,7 +163,8 @@ func (e OrgPlayer) GetInfo(c *gin.Context) {
//获取当前时间范围的赛季id //获取当前时间范围的赛季id
seasonId := s.GetNowSeasonId() seasonId := s.GetNowSeasonId()
if seasonId == "" { if seasonId == "" {
e.Error(109, err, "未获取到数据") e.Logger.Error(seasonId)
e.Error(110, err, "未获取到当前赛季")
return return
} }
...@@ -170,6 +174,7 @@ func (e OrgPlayer) GetInfo(c *gin.Context) { ...@@ -170,6 +174,7 @@ func (e OrgPlayer) GetInfo(c *gin.Context) {
replyDataAvg := dto.OrgMatchInfo{} replyDataAvg := dto.OrgMatchInfo{}
err = s.StatisticsScoringAvg("", seasonId, "avg", &replyDataAvg) err = s.StatisticsScoringAvg("", seasonId, "avg", &replyDataAvg)
if err != nil { if err != nil {
e.Logger.Error(err)
e.Error(109, err, "未获取到数据") e.Error(109, err, "未获取到数据")
return return
} }
...@@ -178,17 +183,25 @@ func (e OrgPlayer) GetInfo(c *gin.Context) { ...@@ -178,17 +183,25 @@ func (e OrgPlayer) GetInfo(c *gin.Context) {
replyOrgMatchInfo := dto.OrgMatchInfo{} replyOrgMatchInfo := dto.OrgMatchInfo{}
err = s.StatisticsScoringAvg(strconv.Itoa(req.PlayerId), seasonId, "avg", &replyOrgMatchInfo) err = s.StatisticsScoringAvg(strconv.Itoa(req.PlayerId), seasonId, "avg", &replyOrgMatchInfo)
if err != nil { if err != nil {
e.Logger.Error(err)
e.Error(109, err, "未获取到数据") e.Error(109, err, "未获取到数据")
return return
} }
reply.OrgMatchInfo = replyOrgMatchInfo reply.OrgMatchInfo = replyOrgMatchInfo
err, matchId := s.GetMatchId(strconv.Itoa(req.PlayerId), seasonId) err, matchId := s.GetMatchId(strconv.Itoa(req.PlayerId), seasonId)
if err != nil || len(matchId) == 0 {
e.Logger.Error(err)
e.Error(109, err, "未获取到数据")
return
}
var count int64 var count int64
replyGetRoundsScoring := make([]dto.OrgPlayerRoundsScoring, 0) replyGetRoundsScoring := make([]dto.OrgPlayerRoundsScoring, 0)
err = s.GetRoundsScoring(&req, matchId, &replyGetRoundsScoring, &count) err = s.GetRoundsScoring(&req, matchId, &replyGetRoundsScoring, &count)
if err != nil { if err != nil {
e.Logger.Error(err)
e.Error(109, err, "未获取到数据") e.Error(109, err, "未获取到数据")
return return
} }
...@@ -221,10 +234,17 @@ func (e OrgPlayer) GetOrgMatchSeason(c *gin.Context) { ...@@ -221,10 +234,17 @@ func (e OrgPlayer) GetOrgMatchSeason(c *gin.Context) {
//生涯数据 //生涯数据
err, matchId2 := s.GetMatchId(strconv.Itoa(req.PlayerId), "") err, matchId2 := s.GetMatchId(strconv.Itoa(req.PlayerId), "")
if err != nil || len(matchId2) == 0 {
e.Logger.Error(err)
e.Error(109, err, "未获取到数据")
return
}
replyGetRoundsScoring := make([]dto.OrgPlayerRoundsScoring, 0) replyGetRoundsScoring := make([]dto.OrgPlayerRoundsScoring, 0)
var count int64 var count int64
err = s.GetSeasonRoundsScoring(&req, matchId2, &replyGetRoundsScoring, &count) err = s.GetSeasonRoundsScoring(&req, matchId2, &replyGetRoundsScoring, &count)
if err != nil { if err != nil {
e.Logger.Error(err)
e.Error(109, err, "未获取到数据") e.Error(109, err, "未获取到数据")
return return
} }
...@@ -263,6 +283,7 @@ func (e OrgPlayer) GetOrgMatchEvaluate(c *gin.Context) { ...@@ -263,6 +283,7 @@ func (e OrgPlayer) GetOrgMatchEvaluate(c *gin.Context) {
err = s.GetOrgMatchEvaluate(&req, &list, &count) err = s.GetOrgMatchEvaluate(&req, &list, &count)
if err != nil { if err != nil {
e.Logger.Error(err)
e.Error(109, err, "未获取到数据") e.Error(109, err, "未获取到数据")
return return
} }
...@@ -297,6 +318,7 @@ func (e OrgPlayer) GetOrgMatchEvaluateContent(c *gin.Context) { ...@@ -297,6 +318,7 @@ func (e OrgPlayer) GetOrgMatchEvaluateContent(c *gin.Context) {
err = s.GetOrgMatchEvaluateContent(&req, &list, &count) err = s.GetOrgMatchEvaluateContent(&req, &list, &count)
if err != nil { if err != nil {
e.Logger.Error(err)
e.Error(109, err, "未获取到数据") e.Error(109, err, "未获取到数据")
return return
} }
...@@ -331,6 +353,7 @@ func (e OrgPlayer) GetOrgRounds(c *gin.Context) { ...@@ -331,6 +353,7 @@ func (e OrgPlayer) GetOrgRounds(c *gin.Context) {
err = s.GetOrgRounds(&req, &list, &count) err = s.GetOrgRounds(&req, &list, &count)
if err != nil { if err != nil {
e.Logger.Error(err)
e.Error(109, err, "未获取到数据") e.Error(109, err, "未获取到数据")
return return
} }
......
app/mobile/apis/org_player_rank.go
View file @ 66c597d7
...@@ -45,6 +45,7 @@ func (e OrgPlayerRank) GetPage(c *gin.Context) { ...@@ -45,6 +45,7 @@ func (e OrgPlayerRank) GetPage(c *gin.Context) {
err = s.GetPage(&req, p, &list, &count) err = s.GetPage(&req, p, &list, &count)
if err != nil { if err != nil {
e.Logger.Error(err)
e.Error(109, err, "未获取到数据") e.Error(109, err, "未获取到数据")
return return
} }
...@@ -58,6 +59,7 @@ func (e OrgPlayerRank) GetPage(c *gin.Context) { ...@@ -58,6 +59,7 @@ func (e OrgPlayerRank) GetPage(c *gin.Context) {
reqOwn.PageSize = 9999 reqOwn.PageSize = 9999
err = s.GetPageOwn(&reqOwn, p, &listOwn, &countOwn) err = s.GetPageOwn(&reqOwn, p, &listOwn, &countOwn)
if err != nil { if err != nil {
e.Logger.Error(err)
e.Error(109, err, "未获取到数据") e.Error(109, err, "未获取到数据")
return return
} }
...@@ -99,6 +101,7 @@ func (e OrgPlayerRank) GetPageTeam(c *gin.Context) { ...@@ -99,6 +101,7 @@ func (e OrgPlayerRank) GetPageTeam(c *gin.Context) {
err = s.GetPageTeam(&req, p, &list, &count) err = s.GetPageTeam(&req, p, &list, &count)
if err != nil { if err != nil {
e.Logger.Error(err)
e.Error(109, err, "未获取到数据") e.Error(109, err, "未获取到数据")
return return
} }
...@@ -133,7 +136,8 @@ func (e OrgPlayerRank) GetPageTeamInfo(c *gin.Context) { ...@@ -133,7 +136,8 @@ func (e OrgPlayerRank) GetPageTeamInfo(c *gin.Context) {
e.MakeContext(c).MakeOrm().MakeService(&sPlayer.Service) e.MakeContext(c).MakeOrm().MakeService(&sPlayer.Service)
req.SeasonId = sPlayer.GetNowSeasonId() req.SeasonId = sPlayer.GetNowSeasonId()
if req.SeasonId == "" { if req.SeasonId == "" {
e.Error(109, err, "未获取到数据") e.Logger.Error(req.SeasonId)
e.Error(110, err, "未获取到当前赛季")
return return
} }
...@@ -142,12 +146,14 @@ func (e OrgPlayerRank) GetPageTeamInfo(c *gin.Context) { ...@@ -142,12 +146,14 @@ func (e OrgPlayerRank) GetPageTeamInfo(c *gin.Context) {
//获取基本信息 //获取基本信息
err = s.GetTeamInfoData(req.TeamId, req.SeasonId, &reply) err = s.GetTeamInfoData(req.TeamId, req.SeasonId, &reply)
if err != nil { if err != nil {
e.Logger.Error(err)
e.Error(109, err, "未获取到数据") e.Error(109, err, "未获取到数据")
return return
} }
//获取排名数据 //获取排名数据
err = s.GetRankTeamInfo(req.TeamId, req.SeasonId, &reply) err = s.GetRankTeamInfo(req.TeamId, req.SeasonId, &reply)
if err != nil { if err != nil {
e.Logger.Error(err)
e.Error(109, err, "未获取到数据") e.Error(109, err, "未获取到数据")
return return
} }
...@@ -158,6 +164,7 @@ func (e OrgPlayerRank) GetPageTeamInfo(c *gin.Context) { ...@@ -158,6 +164,7 @@ func (e OrgPlayerRank) GetPageTeamInfo(c *gin.Context) {
err = s.GetPageTeamInfo(req.TeamId, req.SeasonId, &list, &count) err = s.GetPageTeamInfo(req.TeamId, req.SeasonId, &list, &count)
if err != nil { if err != nil {
e.Logger.Error(err)
e.Error(109, err, "未获取到数据") e.Error(109, err, "未获取到数据")
return return
} }
...@@ -189,6 +196,7 @@ func (e OrgPlayerRank) GetPageTeamInfo(c *gin.Context) { ...@@ -189,6 +196,7 @@ func (e OrgPlayerRank) GetPageTeamInfo(c *gin.Context) {
replyPlayerList := make([]dto.OrgPlayerGetPageReply, 0) replyPlayerList := make([]dto.OrgPlayerGetPageReply, 0)
err = s.GetTeamInfoPlayerList(req.TeamId, &replyPlayerList) err = s.GetTeamInfoPlayerList(req.TeamId, &replyPlayerList)
if err != nil { if err != nil {
e.Logger.Error(err)
e.Error(109, err, "未获取到数据") e.Error(109, err, "未获取到数据")
return return
} }
...@@ -225,6 +233,7 @@ func (e OrgPlayerRank) GetPageLeague(c *gin.Context) { ...@@ -225,6 +233,7 @@ func (e OrgPlayerRank) GetPageLeague(c *gin.Context) {
err = s.GetPage(&req, p, &list, &count) err = s.GetPage(&req, p, &list, &count)
if err != nil { if err != nil {
e.Logger.Error(err)
e.Error(109, err, "未获取到数据") e.Error(109, err, "未获取到数据")
return return
} }
......
app/mobile/apis/org_player_user.go
View file @ 66c597d7
...@@ -45,6 +45,7 @@ func (e OrgPlayerUser) GetMsg(c *gin.Context) { ...@@ -45,6 +45,7 @@ func (e OrgPlayerUser) GetMsg(c *gin.Context) {
return return
} }
if userId == 0 { if userId == 0 {
e.Logger.Error(userId)
e.Error(101, err, "账号未找到") e.Error(101, err, "账号未找到")
return return
} }
...@@ -116,6 +117,7 @@ func (e OrgPlayerUser) Login(c *gin.Context) { ...@@ -116,6 +117,7 @@ func (e OrgPlayerUser) Login(c *gin.Context) {
err = s.Login(&req, p, data) err = s.Login(&req, p, data)
if err != nil { if err != nil {
e.Logger.Error(err)
e.Error(101, err, "账号未找到") e.Error(101, err, "账号未找到")
return return
} }
......
app/operate/apis/org_ad.go
View file @ 66c597d7
package apis package apis
import ( import (
"fmt"
"github.com/gin-gonic/gin" "github.com/gin-gonic/gin"
"github.com/go-admin-team/go-admin-core/sdk/api" "github.com/go-admin-team/go-admin-core/sdk/api"
"github.com/go-admin-team/go-admin-core/sdk/pkg/jwtauth/user" "github.com/go-admin-team/go-admin-core/sdk/pkg/jwtauth/user"
...@@ -48,7 +46,7 @@ func (e OrgAd) GetPage(c *gin.Context) { ...@@ -48,7 +46,7 @@ func (e OrgAd) GetPage(c *gin.Context) {
err = s.GetPage(&req, p, &list, &count) err = s.GetPage(&req, p, &list, &count)
if err != nil { if err != nil {
e.Error(500, err, fmt.Sprintf("获取广告 失败，\r\n失败信息 %s", err.Error())) e.Error(109, err, "未获取到数据")
return return
} }
...@@ -81,7 +79,7 @@ func (e OrgAd) Get(c *gin.Context) { ...@@ -81,7 +79,7 @@ func (e OrgAd) Get(c *gin.Context) {
p := actions.GetPermissionFromContext(c) p := actions.GetPermissionFromContext(c)
err = s.Get(&req, p, &object) err = s.Get(&req, p, &object)
if err != nil { if err != nil {
e.Error(500, err, fmt.Sprintf("获取广告失败，\r\n失败信息 %s", err.Error())) e.Error(109, err, "未获取到数据")
return return
} }
...@@ -116,7 +114,7 @@ func (e OrgAd) Insert(c *gin.Context) { ...@@ -116,7 +114,7 @@ func (e OrgAd) Insert(c *gin.Context) {
err = s.Insert(&req) err = s.Insert(&req)
if err != nil { if err != nil {
e.Error(500, err, fmt.Sprintf("创建广告 失败，\r\n失败信息 %s", err.Error())) e.Error(109, err, "未获取到数据")
return return
} }
...@@ -151,7 +149,7 @@ func (e OrgAd) Update(c *gin.Context) { ...@@ -151,7 +149,7 @@ func (e OrgAd) Update(c *gin.Context) {
err = s.Update(&req, p) err = s.Update(&req, p)
if err != nil { if err != nil {
e.Error(500, err, fmt.Sprintf("修改广告 失败，\r\n失败信息 %s", err.Error())) e.Error(109, err, "未获取到数据")
return return
} }
e.OK(req.GetId(), "修改成功") e.OK(req.GetId(), "修改成功")
...@@ -184,7 +182,8 @@ func (e OrgAd) Delete(c *gin.Context) { ...@@ -184,7 +182,8 @@ func (e OrgAd) Delete(c *gin.Context) {
err = s.Remove(&req, p) err = s.Remove(&req, p)
if err != nil { if err != nil {
e.Error(500, err, fmt.Sprintf("删除广告失败，\r\n失败信息 %s", err.Error())) e.Logger.Error(err)
e.Error(109, err, "未获取到数据")
return return
} }
e.OK(req.GetId(), "删除成功") e.OK(req.GetId(), "删除成功")
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment