|
@@ -643,6 +643,7 @@ impl Core {
|
|
|
// 允许交易
|
|
// 允许交易
|
|
|
if self.mode_signal == 0 && self.ready == 1 && flag == 1 {
|
|
if self.mode_signal == 0 && self.ready == 1 && flag == 1 {
|
|
|
// 更新交易数据
|
|
// 更新交易数据
|
|
|
|
|
+ self.update_trade_msg();
|
|
|
// 触发事件撤单逻辑
|
|
// 触发事件撤单逻辑
|
|
|
// 更新策略时间
|
|
// 更新策略时间
|
|
|
self.strategy.local_time = Utc::now().timestamp_millis();
|
|
self.strategy.local_time = Utc::now().timestamp_millis();
|
|
@@ -658,15 +659,14 @@ impl Core {
|
|
|
&trace_stack.ins);
|
|
&trace_stack.ins);
|
|
|
|
|
|
|
|
if orders.is_not_empty() {
|
|
if orders.is_not_empty() {
|
|
|
|
|
+ TraceStack::show_delay(&trace_stack.ins);
|
|
|
// debug!("触发onTick");
|
|
// debug!("触发onTick");
|
|
|
self._update_local_orders(&orders);
|
|
self._update_local_orders(&orders);
|
|
|
//异步交易所处理订单信号
|
|
//异步交易所处理订单信号
|
|
|
let mut platform_rest_fb = self.platform_rest.clone_box();
|
|
let mut platform_rest_fb = self.platform_rest.clone_box();
|
|
|
// info!("订单指令:{:?}", orders);
|
|
// info!("订单指令:{:?}", orders);
|
|
|
- self.update_trade_msg();
|
|
|
|
|
let ts = trace_stack.clone();
|
|
let ts = trace_stack.clone();
|
|
|
spawn(async move {
|
|
spawn(async move {
|
|
|
- TraceStack::show_delay(&ts.ins);
|
|
|
|
|
platform_rest_fb.command_order(&mut orders, &ts).await;
|
|
platform_rest_fb.command_order(&mut orders, &ts).await;
|
|
|
});
|
|
});
|
|
|
|
|
|