Merge remote-tracking branch 'origin/master'

backend/src/views/competition/components/team.vue

@@ -359,7 +359,7 @@ export default {
     methods: {
         copyTeam(){
             if(this.toTeamId>0){
-                teamApi.copyTeam(this.competitionId, this.toTeamId).then(res=>{
+                teamApi.copyTeam(this.memberQuery2.competitionId, this.toTeamId).then(res=>{
                     this.$notify({
                         title: '提示信息',
                         message: res.msg,

backend/vue.config.js

@@ -30,7 +30,7 @@ module.exports = {
   lintOnSave: false,
   productionSourceMap: false,
   devServer: {
-    port: port,
+    port: 9532,
     open: true,
     disableHostCheck: true,
     overlay: {

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")

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;
@@ -234,7 +235,11 @@ public class RankingBiz {
             }
         });
         computeScore(rankingList,currentTask,competition,baseRatio);
-        computeRanking(rankingList,currentTask,competition.getTeamMaxCount(),now);
+        if(competition.getTeamMaxCount() == null){
+            computeRanking(rankingList,currentTask,1,now);
+        }else{
+            computeRanking(rankingList,currentTask,competition.getTeamMaxCount(),now);
+        }
         computeMemberRank(currentTask.getCompetitionId(),currentTask.getStageId(),competition.getTeamMaxCount());
         competition.setUpdateRankDate(now);
         competitionDao.save(competition);
@@ -393,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);
@@ -463,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;
     }
 }

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 {