From 645e20b727b6d084cec232672d73867f4c101166 Mon Sep 17 00:00:00 2001
From: yz <3614508250@qq.com>
Date: Tue, 18 Apr 2023 09:34:06 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BA=86=E6=A8=A1=E6=8B=9F?=
 =?UTF-8?q?=E4=BA=A4=E6=98=93=E7=B3=BB=E7=BB=9F=E6=8E=92=E8=A1=8C=E6=A6=9C?=
 =?UTF-8?q?=E6=8E=92=E5=90=8D=E4=B8=8D=E6=98=BE=E7=A4=BA=20=E6=A0=B9?=
 =?UTF-8?q?=E6=8D=AE=E7=B4=AF=E8=AE=A1=E6=94=B6=E7=9B=8A=E7=8E=87=E6=8E=92?=
 =?UTF-8?q?=E5=BA=8F=E7=9A=84=E9=97=AE=E9=A2=98=20=E4=BF=AE=E6=94=B9?=
 =?UTF-8?q?=E6=8E=92=E8=A1=8C=E5=B8=AE=E8=AE=A1=E7=AE=97=E5=85=AC=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/tz/platform/CompetitionApplication.java |  6 ++++++
 .../competitiion/job/biz/RankingBiz.java        | 17 ++++++++++-------
 .../platform/competitiion/pc/biz/TeamBiz.java   |  6 +++---
 3 files changed, 19 insertions(+), 10 deletions(-)

diff --git a/tz/competition/competition-service/src/main/java/com/tz/platform/CompetitionApplication.java b/tz/competition/competition-service/src/main/java/com/tz/platform/CompetitionApplication.java
index c7f356b..88a3097 100644
--- a/tz/competition/competition-service/src/main/java/com/tz/platform/CompetitionApplication.java
+++ b/tz/competition/competition-service/src/main/java/com/tz/platform/CompetitionApplication.java
@@ -1,11 +1,17 @@
 package com.tz.platform;
 
+import com.tz.platform.entity.CompetitionMember;
+import com.tz.platform.juejin.JueJinApi;
+import com.tz.platform.repository.CompetitionMemberDao;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.cloud.client.discovery.EnableDiscoveryClient;
 import org.springframework.cloud.openfeign.EnableFeignClients;
+import org.springframework.context.ConfigurableApplicationContext;
 import org.springframework.scheduling.annotation.EnableScheduling;
 
+import java.util.List;
+
 @SpringBootApplication
 @EnableDiscoveryClient
 @EnableFeignClients(basePackages = "com.tz.platform.feign")
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 d7fcd61..b5d28cf 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
@@ -8,6 +8,7 @@ import com.tz.platform.common.core.tools.DateUtil;
 import com.tz.platform.entity.*;
 import com.tz.platform.juejin.JueJinApi;
 import com.tz.platform.repository.*;
+import io.swagger.models.auth.In;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
@@ -397,12 +398,14 @@ public class RankingBiz {
         });
 
 //        rankingList.sort(Comparator.comparing(Ranking::getFinanceScore).reversed());
-////        for(int i = 0;i<rankingList.size();i++){
-////            int rank = i + 1;
-////            Ranking ranking = rankingList.get(i);
-////            ranking.setPersonalRank(rank);
-////            memberDao.updatePersonalRank(ranking.getUserNo(),ranking.getStageId(),ranking.getCompId(),rank);
-////        }
+        rankingList.sort(Comparator.comparing(Ranking::getPnlRatio).reversed());
+        for(int i = 0;i<rankingList.size();i++){
+            int rank = i + 1;
+            Ranking ranking = rankingList.get(i);
+            ranking.setPersonalRank(rank);
+            memberDao.updatePersonalRank(ranking.getUserNo(),ranking.getStageId(),ranking.getCompId(),rank);
+        }
+
 //        try {
 //            Map<Integer, Double> tcrMap = sortMapByValues(teamCombineRank);
 //            AtomicInteger rank = new AtomicInteger(0);
@@ -467,7 +470,7 @@ public class RankingBiz {
      */
     private double computeFinaceScore(CompetitionTask task,double userRatio,double baseRatio,double maxUserRatio){
 //        double score = task.getFinanceBasePower() + ((userRatio - baseRatio) /(maxUserRatio - baseRatio))*  task.getFinancegetFinanceProfitPowerProfitPower();
-        double score = task.getFinanceProfitPower() + ((userRatio - baseRatio) /(maxUserRatio - baseRatio))*  task.getFinanceBasePower();
+        double score = task.getFinanceProfitPower() + ((userRatio) /(maxUserRatio))*  task.getFinanceBasePower();
         return score;
     }
 }
diff --git a/tz/competition/competition-service/src/main/java/com/tz/platform/competitiion/pc/biz/TeamBiz.java b/tz/competition/competition-service/src/main/java/com/tz/platform/competitiion/pc/biz/TeamBiz.java
index d1361f9..d13060f 100644
--- a/tz/competition/competition-service/src/main/java/com/tz/platform/competitiion/pc/biz/TeamBiz.java
+++ b/tz/competition/competition-service/src/main/java/com/tz/platform/competitiion/pc/biz/TeamBiz.java
@@ -80,9 +80,9 @@ public class TeamBiz {
         CompetitionMember member = memberDao.getById(vo.getId());
 
         if(member!=null){
-            if(StringUtils.hasText(member.getAccountId())){
-                return  Result.error("此账号已创建资金账号无法删除");
-            }
+//            if(StringUtils.hasText(member.getAccountId())){
+//                return  Result.error("此账号已创建资金账号无法删除");
+//            }
             memberDao.deleteById(vo.getId());
             updatePeopleCount(member.getCompetitionId());
         }else {