diff --git a/src/main/java/com/peanut/modules/common/service/impl/ClassEntityServiceImpl.java b/src/main/java/com/peanut/modules/common/service/impl/ClassEntityServiceImpl.java index 818d2655..70ede19a 100644 --- a/src/main/java/com/peanut/modules/common/service/impl/ClassEntityServiceImpl.java +++ b/src/main/java/com/peanut/modules/common/service/impl/ClassEntityServiceImpl.java @@ -1469,14 +1469,17 @@ public class ClassEntityServiceImpl extends ServiceImpl0){ - experienceScore = new BigDecimal(classModel.getExperienceScore()); - }else { + if (classEntity.getId()>168){ + double count = Math.ceil(classModel.getDays()/7); + BigDecimal totalScore = new BigDecimal(staticScore*count); experienceScore = experienceScore.divide(totalScore,2, RoundingMode.HALF_UP); experienceScore = experienceScore.multiply(new BigDecimal(classModel.getExperienceScore())); experienceScore = experienceScore.setScale(2,RoundingMode.HALF_UP); + }else { + if (experienceScore.compareTo(new BigDecimal(classModel.getExperienceScore()))>-1){ + experienceScore = new BigDecimal(classModel.getExperienceScore()); + } + experienceScore = experienceScore.setScale(2,RoundingMode.HALF_UP); } map.put("experienceScore",experienceScore); usualScore = usualScore.add(experienceScore);