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