From 8d6b5bb42e84da097691a4e545aa8f2440fd5131 Mon Sep 17 00:00:00 2001 From: wucongxing8150 <815046773@qq.com> Date: Thu, 13 Mar 2025 11:02:52 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BA=86=E5=AE=8C?= =?UTF-8?q?=E6=88=90=E7=97=85=E4=BE=8B=EF=BC=8C=E5=8E=BB=E9=99=A4=E4=BA=86?= =?UTF-8?q?=E7=99=BD=E5=90=8D=E5=8D=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- api/service/User.go | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/api/service/User.go b/api/service/User.go index 490f61b..996ef54 100644 --- a/api/service/User.go +++ b/api/service/User.go @@ -341,19 +341,19 @@ func (r *UserService) ReportUserScore(tx *gorm.DB, projectId, caseId, platformId return nil } - // 检测白名单 - if projectPlatform.IsWhite == 1 { - projectPlatformWhiteService := ProjectPlatformWhiteService{} - isWhite, err := projectPlatformWhiteService.CheckProjectPlatformWhiteByUser(user, projectId, platformId) - if err != nil { - return err - } - - // 非白名单用户，无需发放积分 - if isWhite == false { - return nil - } - } + // 检测白名单-无需检测白名单 + //if projectPlatform.IsWhite == 1 { + // projectPlatformWhiteService := ProjectPlatformWhiteService{} + // isWhite, err := projectPlatformWhiteService.CheckProjectPlatformWhiteByUser(user, projectId, platformId) + // if err != nil { + // return err + // } + // + // //// 非白名单用户，无需发放积分 + // //if isWhite == false { + // // return nil + // //} + //} // 获取需发放积分 reportScore := 0 @@ -481,7 +481,7 @@ func (r *UserService) ReportUserScore(tx *gorm.DB, projectId, caseId, platformId } // 肝胆相照 - if platformId == 1 { + if platformId == 1 && reportScore > 0 { _, err = app.ReportUserScore(appScoreTypeStr, user.UserIden, reportScore) if err != nil { return err From f2d47db3f59af1495d1f64122cbd5e8b6bcb7806 Mon Sep 17 00:00:00 2001 From: wucongxing8150 <815046773@qq.com> Date: Thu, 13 Mar 2025 14:44:12 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E5=8F=91=E6=94=BE=E7=A7=AF=E5=88=86?= =?UTF-8?q?=E7=97=85=E4=BE=8B=E7=99=BD=E5=90=8D=E5=8D=95=E9=97=AE=E9=A2=98?= =?UTF-8?q?=E5=A4=84=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- api/controller/User.go | 4 ++++ api/service/User.go | 51 +++++++++++++++++++++--------------------- 2 files changed, 30 insertions(+), 25 deletions(-) diff --git a/api/controller/User.go b/api/controller/User.go index a0367ec..5ad3813 100644 --- a/api/controller/User.go +++ b/api/controller/User.go @@ -117,6 +117,10 @@ func (b *User) GetUserScore(c *gin.Context) { // 优质留言 var describe []string for _, score := range recordScores { + if score.Score == 0 { + continue + } + d := score.NodeName + ":" if score.Type == 4 { diff --git a/api/service/User.go b/api/service/User.go index 996ef54..50d94c9 100644 --- a/api/service/User.go +++ b/api/service/User.go @@ -341,51 +341,52 @@ func (r *UserService) ReportUserScore(tx *gorm.DB, projectId, caseId, platformId return nil } - // 检测白名单-无需检测白名单 - //if projectPlatform.IsWhite == 1 { - // projectPlatformWhiteService := ProjectPlatformWhiteService{} - // isWhite, err := projectPlatformWhiteService.CheckProjectPlatformWhiteByUser(user, projectId, platformId) - // if err != nil { - // return err - // } - // - // //// 非白名单用户，无需发放积分 - // //if isWhite == false { - // // return nil - // //} - //} - // 获取需发放积分 - reportScore := 0 + score := 0 appScoreTypeStr := "" // 积分发放原因-app superScoreTypeStr := "" // 积分发放原因-超级袋鼠 nodeName := "" // 获取积分节点名称 if scoreType == 1 { // 完成阅读 - reportScore = projectPlatform.CompleteRead + score = projectPlatform.CompleteRead appScoreTypeStr = "互动病例-完成阅读" superScoreTypeStr = "调研奖励(完成阅读)" nodeName = "学习" } else if scoreType == 2 { // 阅读时间满足 - reportScore = projectPlatform.CompleteReadTime + score = projectPlatform.CompleteReadTime appScoreTypeStr = "互动病例-阅读时间满足" superScoreTypeStr = "调研奖励(阅读质量)" nodeName = "阅读达标" } else if scoreType == 3 { // 优质留言 - reportScore = projectPlatform.FirstHighQuality + score = projectPlatform.FirstHighQuality appScoreTypeStr = "互动病例-优质留言" superScoreTypeStr = "调研奖励(社区贡献)" nodeName = "优质留言" } else if scoreType == 4 { // 再次优质留言 - reportScore = projectPlatform.OnceMoreHighQuality + score = projectPlatform.OnceMoreHighQuality appScoreTypeStr = "互动病例-优质留言" superScoreTypeStr = "调研奖励(社区贡献)" nodeName = "优质留言" } + // 检测白名单-无需检测白名单 + var isWhite bool + if projectPlatform.IsWhite == 1 { + projectPlatformWhiteService := ProjectPlatformWhiteService{} + isWhite, err = projectPlatformWhiteService.CheckProjectPlatformWhiteByUser(user, projectId, platformId) + if err != nil { + return err + } + } + + // 当用户为非白名单时，重置积分数 + if isWhite == false { + score = 0 + } + recordScoreDao := dao.RecordScoreDao{} // 检测是否有相同手机号用户 @@ -437,7 +438,7 @@ func (r *UserService) ReportUserScore(tx *gorm.DB, projectId, caseId, platformId UserName: user.UserName, Type: scoreType, NodeName: nodeName, - Score: reportScore, + Score: score, } recordScore, err = recordScoreDao.AddRecordScore(tx, recordScore) @@ -457,20 +458,20 @@ func (r *UserService) ReportUserScore(tx *gorm.DB, projectId, caseId, platformId } // 累计用户领取积分数据 - err = caseUserDao.Inc(tx, caseUser.CaseUserId, "total_score", reportScore) + err = caseUserDao.Inc(tx, caseUser.CaseUserId, "total_score", score) if err != nil { return err } // 累计平台发放积分数据 - err = casePlatformDao.Inc(tx, casePlatform.CasePlatformId, "issued_score", reportScore) + err = casePlatformDao.Inc(tx, casePlatform.CasePlatformId, "issued_score", score) if err != nil { return err } // 累计发放积分数据 caseDao := dao.CaseDao{} - err = caseDao.Inc(tx, caseId, "issued_score", reportScore) + err = caseDao.Inc(tx, caseId, "issued_score", score) if err != nil { return err } @@ -481,8 +482,8 @@ func (r *UserService) ReportUserScore(tx *gorm.DB, projectId, caseId, platformId } // 肝胆相照 - if platformId == 1 && reportScore > 0 { - _, err = app.ReportUserScore(appScoreTypeStr, user.UserIden, reportScore) + if platformId == 1 && score > 0 { + _, err = app.ReportUserScore(appScoreTypeStr, user.UserIden, score) if err != nil { return err }