Merge remote-tracking branch 'origin/master'

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);
+        if (yield > 1000D) {
-        criteria.andMinProfitLessThanOrEqualTo(yield);
+             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<GradeWeight> 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;