From 2f06263dbbeced25ef29937909c81cd76af38bbe Mon Sep 17 00:00:00 2001
From: yz <3614508250@qq.com>
Date: Mon, 7 Aug 2023 13:27:59 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=A1=8C=E6=83=85=E4=B8=AD?=
 =?UTF-8?q?=E5=BF=83=E5=88=B7=E6=96=B0=E9=A2=91=E7=8E=87=20=E4=BF=AE?=
 =?UTF-8?q?=E5=A4=8D=E7=BB=83=E4=B9=A0=E4=B8=93=E5=8C=BA=E6=8C=81=E4=BB=93?=
 =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E9=94=99=E8=AF=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../forex/trading_trading/controller/TakeStashController.java   | 2 +-
 .../forex/trading_trading/controller/TradingController.java     | 2 +-
 .../com/sztzjy/forex/trading_trading/service/ScheduledTask.java | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/main/java/com/sztzjy/forex/trading_trading/controller/TakeStashController.java b/src/main/java/com/sztzjy/forex/trading_trading/controller/TakeStashController.java
index 40583d8..7b27090 100644
--- a/src/main/java/com/sztzjy/forex/trading_trading/controller/TakeStashController.java
+++ b/src/main/java/com/sztzjy/forex/trading_trading/controller/TakeStashController.java
@@ -65,7 +65,7 @@ public class TakeStashController {
         String trainingStatus=jsonObject.getString("trainingStatus");
         TakeStash takeStash = jsonObject.getObject("takeStash", TakeStash.class);
         String trainingId = takeStash.getTrainingId();
-        if(trainingId==null){
+        if(trainingId==null || "".equals(trainingId)){
             trainingId=Constant.PRACTICE_TRAINING_ID;
         }
         PageInfo<TakeStash> pageInfo = takeStashService.findTakeStashByTrainingIdAndMemberIdAndStatus(trainingId, takeStash.getMemberId(), takeStash.getStatus(), pageIndex, pageSize);
diff --git a/src/main/java/com/sztzjy/forex/trading_trading/controller/TradingController.java b/src/main/java/com/sztzjy/forex/trading_trading/controller/TradingController.java
index e800525..beb7f1c 100644
--- a/src/main/java/com/sztzjy/forex/trading_trading/controller/TradingController.java
+++ b/src/main/java/com/sztzjy/forex/trading_trading/controller/TradingController.java
@@ -105,7 +105,7 @@ public class TradingController {
         Double stopWin = jsonObject.getDouble("stopWin");
         String memberId = jsonObject.getString("memberId");
         String trainingId = jsonObject.getString("trainingId");
-        if(trainingId==null){
+        if(trainingId==null || "".equals(trainingId)){
             trainingId=Constant.PRACTICE_TRAINING_ID;
         }
         Double priceCommission = jsonObject.getDouble("priceCommission"); //获取挂单开仓用户输入的价位
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 e19cc31..5ae258f 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
@@ -98,7 +98,7 @@ public class ScheduledTask {
     }
 
     //每10秒执行一次 根据真实汇率数据生成模拟汇率数据
-    @Scheduled(cron = "0/10 * * * * ?")
+    @Scheduled(cron = "0/5 * * * * ?")
     public void insertSimulatedForexMarketData() {
 //        if(!timerEnable){
 //            return;