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 690745a..4321f18 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 @@ -11,6 +11,7 @@ import com.sztzjy.forex.trading_trading.entity.TakeStash; import com.sztzjy.forex.trading_trading.service.MemberService; import com.sztzjy.forex.trading_trading.service.TakeStashService; import com.sztzjy.forex.trading_trading.service.TrainingService; +import com.sztzjy.forex.trading_trading.service.WainingService; import com.sztzjy.forex.trading_trading.util.BigDecimalUtils; import com.sztzjy.forex.trading_trading.util.ForexMarketDateUtil; import com.sztzjy.forex.trading_trading.util.RedisUtil; @@ -50,6 +51,9 @@ public class TakeStashController { @Autowired BigDecimalUtils bigDecimalUtils; + @Autowired + WainingService wainingService; + //获取当前持仓表 status 0为获取当前持仓/1为挂单持仓/2为历史持仓 @AnonymousAccess @PostMapping("getTakeStashList") @@ -265,7 +269,12 @@ public class TakeStashController { takeStash.setProfitAndLossByClose(profitAndLoss); takeStash.setTimeTransactionClose(new Date()); takeStashService.updateByPrimaryKeySelective(takeStash); + + wainingService.compareMarginLevels(member.getMemberId(),member.getTrainingId());//更改可用保证金后 调用预警 + return new ResultEntity(HttpStatus.OK, "平仓成功"); + + } @@ -297,6 +306,8 @@ public class TakeStashController { takeStash.setStatus(2); takeStash.setProfitAndLossByClose(bigDecimalUtils.sub(backFund,tradingMargin)); //盈亏=返还资金-进仓时使用的保证金 takeStashService.updateByPrimaryKeySelective(takeStash); + + wainingService.compareMarginLevels(member.getMemberId(),member.getTrainingId());//更改可用保证金后 调用预警 } 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 b56c867..65a131c 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 @@ -9,10 +9,7 @@ import com.sztzjy.forex.trading_trading.entity.ForexMarketData; import com.sztzjy.forex.trading_trading.entity.Member; import com.sztzjy.forex.trading_trading.entity.PendingOrder; import com.sztzjy.forex.trading_trading.entity.TakeStash; -import com.sztzjy.forex.trading_trading.service.ForexMarketDataService; -import com.sztzjy.forex.trading_trading.service.MemberService; -import com.sztzjy.forex.trading_trading.service.PendingOrderService; -import com.sztzjy.forex.trading_trading.service.TakeStashService; +import com.sztzjy.forex.trading_trading.service.*; import com.sztzjy.forex.trading_trading.util.BigDecimalUtils; import com.sztzjy.forex.trading_trading.util.RedisUtil; import com.sztzjy.forex.trading_trading.util.ResultEntity; @@ -52,6 +49,9 @@ public class TradingController { @Autowired BigDecimalUtils bigDecimalUtils; + @Autowired + WainingService wainingService; + //获取市场报价 @AnonymousAccess @PostMapping("getMarketQuotation") @@ -262,6 +262,7 @@ public class TradingController { Integer openingTrades = member.getOpeningTrades(); //获取开仓次数 member.setOpeningTrades(openingTrades++);//设置开仓次数 memberService.updateByPrimaryKeySelective(member); + wainingService.compareMarginLevels(member.getMemberId(),member.getTrainingId());//更改可用保证金后 调用预警 } //判断止损止赢 逻辑:如果方式为买 则止损低于买价 获利高于买价 / 如果方式为卖 则止损高于卖价 获利低于买价 (可以只传一个参数)