From c83298356fc25dd3f9e378ce93b326d02a691c50 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=99=88=E6=B2=85?= <907037276@qq.com>
Date: Mon, 8 Jan 2024 17:03:48 +0800
Subject: [PATCH] =?UTF-8?q?1=E3=80=81=E6=95=99=E5=B8=88=E7=AB=AF=E9=A6=96?=
 =?UTF-8?q?=E9=A1=B5=E6=8A=A5=E9=94=99=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../trading_trading/service/GradeWeightService.java | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

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