diff --git a/src/main/java/com/sztzjy/forex/trading_trading/service/GradeWeightService.java b/src/main/java/com/sztzjy/forex/trading_trading/service/GradeWeightService.java index 1ff9f42..1c96e43 100644 --- a/src/main/java/com/sztzjy/forex/trading_trading/service/GradeWeightService.java +++ b/src/main/java/com/sztzjy/forex/trading_trading/service/GradeWeightService.java @@ -80,8 +80,13 @@ public class GradeWeightService { GradeWeightExample example = new GradeWeightExample(); GradeWeightExample.Criteria criteria = example.createCriteria(); criteria.andWeightIdEqualTo(weightId); - criteria.andMaxProfitGreaterThan(yield); - criteria.andMinProfitLessThanOrEqualTo(yield); + if (yield > 1000D) { + criteria.andLevelEqualTo(1); + }else{ + criteria.andMaxProfitGreaterThan(yield); + criteria.andMinProfitLessThanOrEqualTo(yield); + } + GradeWeight gradeWeights = gradeWeightMapper.selectByExample(example).get(0); return gradeWeights; } @@ -99,12 +104,12 @@ public class GradeWeightService { return findWeightByWeightId(gradeWeights.getWeightId()); } - public Double findReportScore(String id,Double score) { + public Double findReportScore(String id, Double score) { GradeWeightExample example = new GradeWeightExample(); GradeWeightExample.Criteria criteria = example.createCriteria(); criteria.andWeightIdEqualTo(id); List gradeWeightList = gradeWeightMapper.selectByExample(example); - if (gradeWeightList == null||gradeWeightList.size()==0) { + if (gradeWeightList == null || gradeWeightList.size() == 0) { return null; } return gradeWeightList.get(0).getReportScoreScale() * score / 100;