From 605c7508572975541e5304165ee71fa25ad7232b Mon Sep 17 00:00:00 2001
From: tianea <tianxyy80@gmail.com>
Date: Mon, 28 Nov 2022 19:46:36 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8A=9F=E8=83=BD=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/tz/platform/competitiion/job/biz/RankingBiz.java   | 7 +++++--
 .../com/tz/platform/repository/CompetitionMemberDao.java   | 5 +++++
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/tz/competition/competition-service/src/main/java/com/tz/platform/competitiion/job/biz/RankingBiz.java b/tz/competition/competition-service/src/main/java/com/tz/platform/competitiion/job/biz/RankingBiz.java
index 1df3b73..6fdb280 100644
--- a/tz/competition/competition-service/src/main/java/com/tz/platform/competitiion/job/biz/RankingBiz.java
+++ b/tz/competition/competition-service/src/main/java/com/tz/platform/competitiion/job/biz/RankingBiz.java
@@ -438,7 +438,7 @@ public class RankingBiz {
      * @param financeScore
      * @return
      */
-    private double computeCombineScore(CompetitionTask task,Double examScore,double financeScore){
+    private double computeCombineScore(CompetitionTask task,Double examScore,Double financeScore){
         if(examScore == null){
             examScore =0d;
         }
@@ -446,6 +446,9 @@ public class RankingBiz {
         if(power == null){
             power = 0L;
         }
+        if(financeScore == null){
+            financeScore = 0D;
+        }
         double score = (examScore*power+financeScore*task.getFinancePower())/100;
         return  score;
     }
@@ -459,7 +462,7 @@ public class RankingBiz {
      * @return
      */
     private double computeFinaceScore(CompetitionTask task,double userRatio,double baseRatio,double maxUserRatio){
-//        double score = task.getFinanceBasePower() + ((userRatio - baseRatio) /(maxUserRatio - baseRatio))*  task.getFinanceProfitPower();
+//        double score = task.getFinanceBasePower() + ((userRatio - baseRatio) /(maxUserRatio - baseRatio))*  task.getFinancegetFinanceProfitPowerProfitPower();
         double score = task.getFinanceProfitPower() + ((userRatio - baseRatio) /(maxUserRatio - baseRatio))*  task.getFinanceBasePower();
         return score;
     }
diff --git a/tz/competition/competition-service/src/main/java/com/tz/platform/repository/CompetitionMemberDao.java b/tz/competition/competition-service/src/main/java/com/tz/platform/repository/CompetitionMemberDao.java
index 2aa8216..7bcc08b 100644
--- a/tz/competition/competition-service/src/main/java/com/tz/platform/repository/CompetitionMemberDao.java
+++ b/tz/competition/competition-service/src/main/java/com/tz/platform/repository/CompetitionMemberDao.java
@@ -43,14 +43,17 @@ public interface CompetitionMemberDao extends JpaRepository<CompetitionMember,In
     CompetitionMember getByCompetitionIdAndStageIdAndUserId(Long compId,Integer stageId,Long userId);
     CompetitionMember getByCompetitionIdAndStageIdAndUserIdAndTeamId(Long compId,Integer stageId,Long userId,Integer teamId);
 
+    @Transactional
     @Modifying
     @Query(value = "update competition_member set exam_score=:score where user_id=:userNo and stage_id=:stageId and competition_id=:compId",nativeQuery = true)
     int updateScore(@Param("userNo") Long userNo,@Param("stageId") Integer stageId,@Param("compId") Long comId,  @Param("score") Double score);
 
+    @Transactional
     @Modifying
     @Query(value = "update competition_member set exam_start_time=:startTime where user_id=:userNo and stage_id=:stageId and competition_id=:compId",nativeQuery = true)
     int updateExamStartTime(@Param("userNo") Long userNo,@Param("stageId") Integer stageId,@Param("compId") Long comId,  @Param("startTime") Date startTime);
 
+    @Transactional
     @Modifying
     @Query(value = "update competition_member set exam_end_time=:endTime,exam_cost_time=:costTime where user_id=:userNo and stage_id=:stageId and competition_id=:compId",nativeQuery = true)
     int updateExamEndTimeAndCostTime(@Param("userNo") Long userNo,@Param("stageId") Integer stageId,@Param("compId") Long comId,  @Param("endTime") Date endTime, @Param("costTime") Long costTime);
@@ -58,10 +61,12 @@ public interface CompetitionMemberDao extends JpaRepository<CompetitionMember,In
     @Query(value = "update competition_member set report_id=:reportId where user_id=:userNo and stage_id=:stageId and competition_id=:compId",nativeQuery = true)
     int updateReportId(@Param("userNo") Long userNo,@Param("stageId") Integer stageId,@Param("compId") Long comId,  @Param("reportId") Integer reportId);
 
+    @Transactional
     @Modifying
     @Query(value = "update competition_member set highest_ratio=:ratio where user_id=:userNo and stage_id=:stageId and competition_id=:compId",nativeQuery = true)
     int updateHighestRatio(@Param("userNo") Long userNo,@Param("stageId") Integer stageId,@Param("compId") Long comId,  @Param("ratio") Double ratio);
 
+    @Transactional
     @Modifying
     @Query(value = "update competition_member set combine_score=:combineScore where id=:id",nativeQuery = true)
     int updateComineScore(@Param("combineScore") Double combineScore,@Param("id") Integer id);