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 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 {