diff --git a/api/controller/Case.go b/api/controller/Case.go index 6a63d1e..c85b519 100644 --- a/api/controller/Case.go +++ b/api/controller/Case.go @@ -394,7 +394,7 @@ func (b *Case) FinishCase(c *gin.Context) { startRead, err := time.Parse("2006-01-02 15:04:05", req.StartRead) if err != nil { tx.Rollback() - responses.FailWithMessage("评论失败9", c) + responses.FailWithMessage("评论失败", c) return } caseUser.StartTime = model.LocalTime(startRead) @@ -403,7 +403,7 @@ func (b *Case) FinishCase(c *gin.Context) { endRead, err := time.Parse("2006-01-02 15:04:05", req.EndRead) if err != nil { tx.Rollback() - responses.FailWithMessage("评论失败8", c) + responses.FailWithMessage("评论失败", c) return } caseUser.EndTime = model.LocalTime(endRead) @@ -412,7 +412,7 @@ func (b *Case) FinishCase(c *gin.Context) { readDuration := endRead.Sub(startRead) if readDuration <= 0 { tx.Rollback() - responses.FailWithMessage("评论失败7", c) + responses.FailWithMessage("评论失败", c) return } caseUser.ReadDuration = int(readDuration.Seconds()) @@ -420,7 +420,7 @@ func (b *Case) FinishCase(c *gin.Context) { _, err = caseUserDao.AddCaseUser(tx, caseUser) if err != nil { tx.Rollback() - responses.FailWithMessage("评论失败6", c) + responses.FailWithMessage("评论失败", c) return } @@ -437,7 +437,7 @@ func (b *Case) FinishCase(c *gin.Context) { err = userService.AddCaseUserAnswer(tx, caseId, platformId, userId, caseUser.CaseUserId, req.Answer) if err != nil { tx.Rollback() - responses.FailWithMessage("评论失败4", c) + responses.FailWithMessage("评论失败", c) return } } @@ -446,7 +446,7 @@ func (b *Case) FinishCase(c *gin.Context) { err = userService.ReportUserScore(tx, caseResult.ProjectId, caseId, platformId, 1, user) if err != nil { tx.Rollback() - responses.FailWithMessage("评论失败3", c) + responses.FailWithMessage("评论失败", c) return } @@ -458,7 +458,7 @@ func (b *Case) FinishCase(c *gin.Context) { projectPlatform, err := projectPlatformDao.GetProjectPlatform(maps) if err != nil { tx.Rollback() - responses.FailWithMessage("评论失败1", c) + responses.FailWithMessage("评论失败", c) return } @@ -467,7 +467,7 @@ func (b *Case) FinishCase(c *gin.Context) { err = userService.ReportUserScore(tx, caseResult.ProjectId, caseId, platformId, 2, user) if err != nil { tx.Rollback() - responses.FailWithMessage("评论失败2", c) + responses.FailWithMessage("评论失败", c) return } } diff --git a/api/controller/User.go b/api/controller/User.go index 72d993e..a0367ec 100644 --- a/api/controller/User.go +++ b/api/controller/User.go @@ -119,14 +119,14 @@ func (b *User) GetUserScore(c *gin.Context) { for _, score := range recordScores { d := score.NodeName + ":" - if mergedScore != 0 { - score.Score = mergedScore - } - if score.Type == 4 { continue } + if score.Type == 3 && mergedScore != 0 { + score.Score = mergedScore + } + if platformId == 2 { d = d + fmt.Sprintf("%d", score.Score*10) } else {