From c003d9e65b877b92c0bb4968b8a12fceea44701e Mon Sep 17 00:00:00 2001
From: yz <3614508250@qq.com>
Date: Mon, 26 Feb 2024 13:44:00 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E6=A0=B9=E6=8D=AEstudentnumb?=
 =?UTF-8?q?er=E8=8E=B7=E5=8F=96=E8=AE=AD=E7=BB=83?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../forex/trading_trading/service/ScheduledTask.java      | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/main/java/com/sztzjy/forex/trading_trading/service/ScheduledTask.java b/src/main/java/com/sztzjy/forex/trading_trading/service/ScheduledTask.java
index fdbe8f4..1b5d1c4 100644
--- a/src/main/java/com/sztzjy/forex/trading_trading/service/ScheduledTask.java
+++ b/src/main/java/com/sztzjy/forex/trading_trading/service/ScheduledTask.java
@@ -303,7 +303,7 @@ public class ScheduledTask {
                         }
                     }else { //开仓方式为卖  则平仓方式为买 先获取买价
                         Double buyPic = forexMarketData.getBuyPic();
-                        if(stopLoss!=-1 && buyPic<=stopLoss){
+                        if(stopLoss!=-1 && buyPic>=stopLoss){
                             Double margin = takeStashController.startUSDMarginNeed(trainingId, memberId, 0, tradingCode, buySellType, transactionVolume);
                             if (margin==0.0){
                                 redisUtil.del("trainingId_"+trainingId+"_stashId_"+stashId);
@@ -313,7 +313,7 @@ public class ScheduledTask {
                             takeStashController.updateMemberAndTakeStash(memberId,stashId,profitLoss,margin,stopLoss);
                             redisUtil.del("trainingId_"+trainingId+"_stashId_"+stashId);
                         }
-                        if(stopWin!=-1 && buyPic>=stopWin){
+                        if(stopWin!=-1 && buyPic<=stopWin){
                             Double margin = takeStashController.startUSDMarginNeed(trainingId, memberId, 0, tradingCode, buySellType, transactionVolume);
                             if (margin==0.0){
                                 redisUtil.del("trainingId_"+trainingId+"_stashId_"+stashId);
@@ -349,7 +349,7 @@ public class ScheduledTask {
                         }
                     }else { //开仓方式为卖  则平仓方式为买 先获取买价
                         Double buyPic = forexMarketData.getBuyPic();
-                        if(stopLoss!=-1 && buyPic<=stopLoss){
+                        if(stopLoss!=-1 && buyPic>=stopLoss){
                             Double margin = takeStashController.endUSDMarginNeed( trainingId, memberId,0 , tradingCode, buySellType, transactionVolume, priceTransaction);
                             if (margin==0.0){
                                 redisUtil.del("trainingId_"+trainingId+"_stashId_"+stashId);
@@ -359,7 +359,7 @@ public class ScheduledTask {
                             takeStashController.updateMemberAndTakeStash(memberId,stashId,profitLoss,margin,stopLoss);
                             redisUtil.del("trainingId_"+trainingId+"_stashId_"+stashId);
                         }
-                        if(stopWin!=-1 && buyPic>=stopWin){
+                        if(stopWin!=-1 && buyPic<=stopWin){
                             Double margin = takeStashController.endUSDMarginNeed( trainingId, memberId,0 , tradingCode, buySellType, transactionVolume, priceTransaction);
                             if (margin==0.0){
                                 redisUtil.del("trainingId_"+trainingId+"_stashId_"+stashId);