diff --git a/src/main/java/com/peanut/modules/common/entity/TrainingClass.java b/src/main/java/com/peanut/modules/common/entity/TrainingClass.java index b38f137e..d3083e00 100644 --- a/src/main/java/com/peanut/modules/common/entity/TrainingClass.java +++ b/src/main/java/com/peanut/modules/common/entity/TrainingClass.java @@ -60,10 +60,19 @@ public class TrainingClass { //svip费用 private BigDecimal svipFee; - //三星湖粉费用(90湖分以上) + //一星湖粉费用(30湖分) + private BigDecimal oneHuFee; + + //二星湖粉费用60 + private BigDecimal twoHuFee; + + //三星湖粉费用90 private BigDecimal threeHuFee; - //五星湖粉费用(150湖分以上) + //四星湖粉费用120 + private BigDecimal fourHuFee; + + //五星湖粉及以上150 private BigDecimal fiveHuFee; //学生费用 diff --git a/src/main/java/com/peanut/modules/common/service/impl/TrainingClassServiceImpl.java b/src/main/java/com/peanut/modules/common/service/impl/TrainingClassServiceImpl.java index b7cb25c2..feb33a2d 100644 --- a/src/main/java/com/peanut/modules/common/service/impl/TrainingClassServiceImpl.java +++ b/src/main/java/com/peanut/modules/common/service/impl/TrainingClassServiceImpl.java @@ -76,11 +76,36 @@ public class TrainingClassServiceImpl extends ServiceImpl0){ + Map map = null; + if (trainingClass.getOneHuFee().compareTo(BigDecimal.ZERO)>0||trainingClass.getTwoHuFee().compareTo(BigDecimal.ZERO)>0|| + trainingClass.getThreeHuFee().compareTo(BigDecimal.ZERO)>0||trainingClass.getFourHuFee().compareTo(BigDecimal.ZERO)>0|| + trainingClass.getFiveHuFee().compareTo(BigDecimal.ZERO)>0) { MPJLambdaWrapper wrapper = new MPJLambdaWrapper(); wrapper.eq(UserContribution::getUserId,userId); wrapper.selectSum(UserContribution::getScore); - Map map = userContributionService.getMap(wrapper); + map = userContributionService.getMap(wrapper); + } + if (trainingClass.getOneHuFee().compareTo(BigDecimal.ZERO)>0){ + if (map != null&&map.containsKey("score")){ + if (new BigDecimal(map.get("score").toString()).compareTo(new BigDecimal(30))>=0){ + if (fee.compareTo(trainingClass.getOneHuFee())>=0){ + fee = trainingClass.getOneHuFee(); + identity = "一星湖粉"; + } + } + } + } + if (trainingClass.getTwoHuFee().compareTo(BigDecimal.ZERO)>0){ + if (map != null&&map.containsKey("score")){ + if (new BigDecimal(map.get("score").toString()).compareTo(new BigDecimal(60))>=0){ + if (fee.compareTo(trainingClass.getTwoHuFee())>=0){ + fee = trainingClass.getTwoHuFee(); + identity = "二星湖粉"; + } + } + } + } + if (trainingClass.getThreeHuFee().compareTo(BigDecimal.ZERO)>0){ if (map != null&&map.containsKey("score")){ if (new BigDecimal(map.get("score").toString()).compareTo(new BigDecimal(90))>=0){ if (fee.compareTo(trainingClass.getThreeHuFee())>=0){ @@ -90,16 +115,22 @@ public class TrainingClassServiceImpl extends ServiceImpl0){ + if (map != null&&map.containsKey("score")){ + if (new BigDecimal(map.get("score").toString()).compareTo(new BigDecimal(120))>=0){ + if (fee.compareTo(trainingClass.getFourHuFee())>=0){ + fee = trainingClass.getFourHuFee(); + identity = "四星湖粉"; + } + } + } + } if (trainingClass.getFiveHuFee().compareTo(BigDecimal.ZERO)>0){ - MPJLambdaWrapper wrapper = new MPJLambdaWrapper(); - wrapper.eq(UserContribution::getUserId,userId); - wrapper.selectSum(UserContribution::getScore); - Map map = userContributionService.getMap(wrapper); if (map != null&&map.containsKey("score")){ if (new BigDecimal(map.get("score").toString()).compareTo(new BigDecimal(150))>=0){ if (fee.compareTo(trainingClass.getFiveHuFee())>=0){ fee = trainingClass.getFiveHuFee(); - identity = "五星湖粉"; + identity = "五星湖粉及以上"; } } }