diff --git a/app/mobile/apis/org_news.go b/app/mobile/apis/org_news.go index 93acfb13323b6b95afd900009f0c2c9163962967..885ad7321cb636efe30cbf8ebf21909ec85a2e6d 100755 --- a/app/mobile/apis/org_news.go +++ b/app/mobile/apis/org_news.go @@ -1,7 +1,6 @@ package apis import ( - "fmt" oDto "go-admin/app/operate/service/dto" "github.com/gin-gonic/gin" @@ -55,7 +54,7 @@ func (e OrgNews) GetPage(c *gin.Context) { err = sOrgAd.GetPage(&reqOrgAd, p, &listOrgAd, &countOrgAd) if err != nil { - e.Error(500, err, fmt.Sprintf("鑾峰彇骞垮憡 澶辫触锛孿r\n澶辫触淇℃伅 %s", err.Error())) + e.Error(109, err, "鏈幏鍙栧埌鏁版嵁") return } @@ -64,7 +63,7 @@ func (e OrgNews) GetPage(c *gin.Context) { err = s.GetPage(&req, p, &list, &count) if err != nil { - e.Error(500, err, fmt.Sprintf("鑾峰彇鏂伴椈 澶辫触锛孿r\n澶辫触淇℃伅 %s", err.Error())) + e.Error(109, err, "鏈幏鍙栧埌鏁版嵁") return } var reply dto.OrgNewsGetPageReply @@ -100,7 +99,7 @@ func (e OrgNews) Get(c *gin.Context) { p := actions.GetPermissionFromContext(c) err = s.Get(&req, p, &object) if err != nil { - e.Error(500, err, fmt.Sprintf("鑾峰彇鏂伴椈澶辫触锛孿r\n澶辫触淇℃伅 %s", err.Error())) + e.Error(109, err, "鏈幏鍙栧埌鏁版嵁") return } diff --git a/app/mobile/apis/org_player.go b/app/mobile/apis/org_player.go index 2c99842d46976b53f39270482989d67bec213bc9..a076b894564c2e903f3ca02f5e8dca55ba3333bf 100755 --- a/app/mobile/apis/org_player.go +++ b/app/mobile/apis/org_player.go @@ -1,7 +1,6 @@ package apis import ( - "fmt" "github.com/gin-gonic/gin" "github.com/go-admin-team/go-admin-core/sdk/api" _ "github.com/go-admin-team/go-admin-core/sdk/pkg/response" @@ -49,7 +48,7 @@ func (e OrgPlayer) GetPage(c *gin.Context) { err = s.GetPage(&req, p, &list, &count) if err != nil { - e.Error(500, err, fmt.Sprintf("鑾峰彇鐞冨憳 澶辫触锛孿r\n澶辫触淇℃伅 %s", err.Error())) + e.Error(109, err, "鏈幏鍙栧埌鏁版嵁") return } @@ -83,7 +82,7 @@ func (e OrgPlayer) Get(c *gin.Context) { p := actions.GetPermissionFromContext(c) err = s.Get(&req, p, &object) if err != nil { - e.Error(500, err, fmt.Sprintf("鑾峰彇鐞冨憳澶辫触锛孿r\n澶辫触淇℃伅 %s", err.Error())) + e.Error(109, err, "鏈幏鍙栧埌鏁版嵁") return } @@ -154,12 +153,16 @@ func (e OrgPlayer) GetInfo(c *gin.Context) { p := actions.GetPermissionFromContext(c) err = s.Get(&reqGet, p, &object) if err != nil { - e.Error(500, err, fmt.Sprintf("鑾峰彇鐞冨憳澶辫触锛孿r\n澶辫触淇℃伅 %s", err.Error())) + e.Error(109, err, "鏈幏鍙栧埌鏁版嵁") return } //鑾峰彇褰撳墠鏃堕棿鑼冨洿鐨勮禌瀛d seasonId := s.GetNowSeasonId() + if seasonId == "" { + e.Error(109, err, "鏈幏鍙栧埌鏁版嵁") + return + } reply := new(dto.OrgPlayerGetInfoReply) reply.OrgPlayerInfo = object @@ -167,7 +170,7 @@ func (e OrgPlayer) GetInfo(c *gin.Context) { replyDataAvg := dto.OrgMatchInfo{} err = s.StatisticsScoringAvg("", seasonId, "avg", &replyDataAvg) if err != nil { - e.Error(500, err, fmt.Sprintf("鑾峰彇姣旇禌鐞冨憳淇℃伅 澶辫触锛孿r\n澶辫触淇℃伅 %s", err.Error())) + e.Error(109, err, "鏈幏鍙栧埌鏁版嵁") return } reply.DataAvg = replyDataAvg @@ -175,7 +178,7 @@ func (e OrgPlayer) GetInfo(c *gin.Context) { replyOrgMatchInfo := dto.OrgMatchInfo{} err = s.StatisticsScoringAvg(strconv.Itoa(req.PlayerId), seasonId, "avg", &replyOrgMatchInfo) if err != nil { - e.Error(500, err, fmt.Sprintf("鑾峰彇姣旇禌鐞冨憳淇℃伅 澶辫触锛孿r\n澶辫触淇℃伅 %s", err.Error())) + e.Error(109, err, "鏈幏鍙栧埌鏁版嵁") return } reply.OrgMatchInfo = replyOrgMatchInfo @@ -186,12 +189,11 @@ func (e OrgPlayer) GetInfo(c *gin.Context) { replyGetRoundsScoring := make([]dto.OrgPlayerRoundsScoring, 0) err = s.GetRoundsScoring(&req, matchId, &replyGetRoundsScoring, &count) if err != nil { - e.Error(500, err, fmt.Sprintf("鑾峰彇姣旇禌鐞冨憳淇℃伅 澶辫触锛孿r\n澶辫触淇℃伅 %s", err.Error())) + e.Error(109, err, "鏈幏鍙栧埌鏁版嵁") return } reply.RoundsScoring = replyGetRoundsScoring - //e.OK(reply, "鏌ヨ鎴愬姛") e.PageOK(reply, int(count), req.GetPageIndex(), req.GetPageSize(), "鏌ヨ鎴愬姛") } @@ -223,7 +225,7 @@ func (e OrgPlayer) GetOrgMatchSeason(c *gin.Context) { var count int64 err = s.GetSeasonRoundsScoring(&req, matchId2, &replyGetRoundsScoring, &count) if err != nil { - e.Error(500, err, fmt.Sprintf("鑾峰彇姣旇禌鐞冨憳淇℃伅 澶辫触锛孿r\n澶辫触淇℃伅 %s", err.Error())) + e.Error(109, err, "鏈幏鍙栧埌鏁版嵁") return } e.PageOK(replyGetRoundsScoring, int(count), req.GetPageIndex(), req.GetPageSize(), "鏌ヨ鎴愬姛") @@ -259,10 +261,9 @@ func (e OrgPlayer) GetOrgMatchEvaluate(c *gin.Context) { list := make([]dto.OrgPlayerGetOrgMatchEvaluateReply, 0) var count int64 - //p := actions.GetPermissionFromContext(c) err = s.GetOrgMatchEvaluate(&req, &list, &count) if err != nil { - e.Error(500, err, fmt.Sprintf("鑾峰彇鐞冨憳澶辫触锛孿r\n澶辫触淇℃伅 %s", err.Error())) + e.Error(109, err, "鏈幏鍙栧埌鏁版嵁") return } @@ -294,10 +295,9 @@ func (e OrgPlayer) GetOrgMatchEvaluateContent(c *gin.Context) { list := make([]dto.OrgPlayerGetOrgMatchEvaluateContentReply, 0) var count int64 - //p := actions.GetPermissionFromContext(c) err = s.GetOrgMatchEvaluateContent(&req, &list, &count) if err != nil { - e.Error(500, err, fmt.Sprintf("鑾峰彇鐞冨憳澶辫触锛孿r\n澶辫触淇℃伅 %s", err.Error())) + e.Error(109, err, "鏈幏鍙栧埌鏁版嵁") return } @@ -329,10 +329,9 @@ func (e OrgPlayer) GetOrgRounds(c *gin.Context) { list := make([]dto.GetRoundsReply, 0) var count int64 - //p := actions.GetPermissionFromContext(c) err = s.GetOrgRounds(&req, &list, &count) if err != nil { - e.Error(500, err, fmt.Sprintf("鑾峰彇鐞冨憳澶辫触锛孿r\n澶辫触淇℃伅 %s", err.Error())) + e.Error(109, err, "鏈幏鍙栧埌鏁版嵁") return } diff --git a/app/mobile/apis/org_player_rank.go b/app/mobile/apis/org_player_rank.go index d8808d41a317ad25e5388483045f891515204612..745516fa403701d497896ab471ee40d066bdd710 100755 --- a/app/mobile/apis/org_player_rank.go +++ b/app/mobile/apis/org_player_rank.go @@ -1,7 +1,6 @@ package apis import ( - "fmt" "github.com/gin-gonic/gin" "github.com/go-admin-team/go-admin-core/sdk/api" _ "github.com/go-admin-team/go-admin-core/sdk/pkg/response" @@ -46,7 +45,7 @@ func (e OrgPlayerRank) GetPage(c *gin.Context) { err = s.GetPage(&req, p, &list, &count) if err != nil { - e.Error(500, err, fmt.Sprintf("鑾峰彇鐞冮槦 澶辫触锛孿r\n澶辫触淇℃伅 %s", err.Error())) + e.Error(109, err, "鏈幏鍙栧埌鏁版嵁") return } @@ -59,7 +58,7 @@ func (e OrgPlayerRank) GetPage(c *gin.Context) { reqOwn.PageSize = 9999 err = s.GetPageOwn(&reqOwn, p, &listOwn, &countOwn) if err != nil { - e.Error(500, err, fmt.Sprintf("鑾峰彇鐞冮槦 澶辫触锛孿r\n澶辫触淇℃伅 %s", err.Error())) + e.Error(109, err, "鏈幏鍙栧埌鏁版嵁") return } @@ -100,7 +99,7 @@ func (e OrgPlayerRank) GetPageTeam(c *gin.Context) { err = s.GetPageTeam(&req, p, &list, &count) if err != nil { - e.Error(500, err, fmt.Sprintf("鑾峰彇鐞冮槦 澶辫触锛孿r\n澶辫触淇℃伅 %s", err.Error())) + e.Error(109, err, "鏈幏鍙栧埌鏁版嵁") return } @@ -133,13 +132,25 @@ func (e OrgPlayerRank) GetPageTeamInfo(c *gin.Context) { sPlayer := service.OrgPlayer{} e.MakeContext(c).MakeOrm().MakeService(&sPlayer.Service) req.SeasonId = sPlayer.GetNowSeasonId() + if req.SeasonId == "" { + e.Error(109, err, "鏈幏鍙栧埌鏁版嵁") + return + } reply := dto.OrgPlayerRankInfoGetReply{} //鑾峰彇鍩烘湰淇℃伅 err = s.GetTeamInfoData(req.TeamId, req.SeasonId, &reply) + if err != nil { + e.Error(109, err, "鏈幏鍙栧埌鏁版嵁") + return + } //鑾峰彇鎺掑悕鏁版嵁 err = s.GetRankTeamInfo(req.TeamId, req.SeasonId, &reply) + if err != nil { + e.Error(109, err, "鏈幏鍙栧埌鏁版嵁") + return + } //鑾峰彇骞冲潎鍊兼暟鎹� list := make([]dto.OrgPlayerRankGetPageReply, 0) @@ -147,7 +158,7 @@ func (e OrgPlayerRank) GetPageTeamInfo(c *gin.Context) { err = s.GetPageTeamInfo(req.TeamId, req.SeasonId, &list, &count) if err != nil { - e.Error(500, err, fmt.Sprintf("鑾峰彇鐞冮槦 澶辫触锛孿r\n澶辫触淇℃伅 %s", err.Error())) + e.Error(109, err, "鏈幏鍙栧埌鏁版嵁") return } @@ -177,6 +188,10 @@ func (e OrgPlayerRank) GetPageTeamInfo(c *gin.Context) { //鑾峰彇鐞冨憳鍒楄〃 replyPlayerList := make([]dto.OrgPlayerGetPageReply, 0) err = s.GetTeamInfoPlayerList(req.TeamId, &replyPlayerList) + if err != nil { + e.Error(109, err, "鏈幏鍙栧埌鏁版嵁") + return + } reply.PlayerList = replyPlayerList e.OK(reply, "鏌ヨ鎴愬姛") @@ -210,7 +225,7 @@ func (e OrgPlayerRank) GetPageLeague(c *gin.Context) { err = s.GetPage(&req, p, &list, &count) if err != nil { - e.Error(500, err, fmt.Sprintf("鑾峰彇鑱旇禌 澶辫触锛孿r\n澶辫触淇℃伅 %s", err.Error())) + e.Error(109, err, "鏈幏鍙栧埌鏁版嵁") return } diff --git a/app/mobile/apis/org_player_user.go b/app/mobile/apis/org_player_user.go index 796ad8490177a220d5b92c34a34a5d566f897829..3f7c27c5192e389a0e3b5bc54f812910384f2970 100755 --- a/app/mobile/apis/org_player_user.go +++ b/app/mobile/apis/org_player_user.go @@ -60,13 +60,19 @@ func (e OrgPlayerUser) GetMsg(c *gin.Context) { Errors if errMsg != nil { e.Logger.Error(err) - e.Error(500, err, err.Error()) + e.Error(106, err, "鍙戦€侀獙璇佺爜澶辫触") return } + reqMsg.Username = req.Username reqMsg.Code = code reqMsg.MsgType = "1" err = sMsg.Insert(&reqMsg) + if err != nil { + e.Logger.Error(err) + e.Error(106, err, "鍙戦€侀獙璇佺爜澶辫触") + return + } smsText := "鎮ㄧ殑楠岃瘉鐮佷负锛�" + code if result := utils.SendMobileMsg(req.Username, smsText); result.Status == 0 { @@ -75,7 +81,7 @@ func (e OrgPlayerUser) GetMsg(c *gin.Context) { return } else { e.Logger.Error(err) - e.Error(500, err, "鍙戦€佸け璐�") + e.Error(106, err, "鍙戦€侀獙璇佺爜澶辫触") return } @@ -122,7 +128,7 @@ func (e OrgPlayerUser) Login(c *gin.Context) { Errors if err != nil { e.Logger.Error(err) - e.Error(500, err, err.Error()) + e.Error(107, err, "楠岃瘉鐮佹牎楠屽け璐�") return } reqMsg.Username = req.Username @@ -135,11 +141,17 @@ func (e OrgPlayerUser) Login(c *gin.Context) { return } - sMsg.Remove(req.Username) + err = sMsg.Remove(req.Username) //鑷缓token鐢熸垚 reply := new(dto.LoginReply) - token, _ := utils.GenToken(int64(data.Id)) + token, err := utils.GenToken(int64(data.Id)) + if err != nil { + e.Logger.Error(err) + e.Error(108, err, "鐢熸垚token澶辫触") + return + } + reply.Token = token reply.PlayerUserId = strconv.Itoa(data.Id) diff --git a/app/operate/apis/org_upload.go b/app/operate/apis/org_upload.go index 91ab0c9e2511ab2ab2bf12af184dd75520b9f805..bf86aada609d53eca3fbb5bce1985dba3e4cbf6a 100755 --- a/app/operate/apis/org_upload.go +++ b/app/operate/apis/org_upload.go @@ -16,10 +16,10 @@ type OrgUpload struct { api.Api } -// GetPage <淇变箰閮�>鑾峰彇淇变箰閮ㄥ垪琛� -// @Summary <淇变箰閮�>鑾峰彇淇变箰閮ㄥ垪琛� -// @Description <淇变箰閮�>鑾峰彇淇变箰閮ㄥ垪琛� -// @Tags <淇变箰閮�>淇变箰閮� +// GetPage <org>涓婁紶鍥剧墖 +// @Summary <org>涓婁紶鍥剧墖 +// @Description <org>涓婁紶鍥剧墖 +// @Tags <org>閫氱敤 // @Param pageSize query int false "椤垫潯鏁�" // @Param pageIndex query int false "椤电爜" // @Param data body dto.OrgClubGetPageReq true "data"