Browse Source

v4.2.5: 取消订单后不要把取消的结果发送给逻辑层,等ws推送才是准确的。

skyffire 7 months ago
parent
commit
2c0ec869db
2 changed files with 8 additions and 4 deletions
  1. 2 2
      standard/src/bitget_swap.rs
  2. 6 2
      standard/src/bybit_swap.rs

+ 2 - 2
standard/src/bitget_swap.rs

@@ -664,7 +664,7 @@ impl Platform for BitgetSwap {
                 // let before_submit1 = Utc::now().timestamp_millis();
                 let result = self_clone.cancel_order(&order_id, &custom_id).await;
                 match result {
-                    Ok(result) => {
+                    Ok(_order) => {
                         // let canceled = Utc::now().timestamp_millis();
                         // info!("cid={}, 生成-撤销2: {}, 撤销2-撤销1: {}, 撤销1-撤销完成(服务器回报): {}",
                         //     custom_id,
@@ -673,7 +673,7 @@ impl Platform for BitgetSwap {
                         //     canceled - before_submit1
                         // );
 
-                        self_clone.order_sender.send(result).await.unwrap();
+                        // self_clone.order_sender.send(order).await.unwrap();
                     }
                     Err(error) => {
                         // 取消失败去查订单。

+ 6 - 2
standard/src/bybit_swap.rs

@@ -375,7 +375,11 @@ impl Platform for BybitSwap {
             if res_data_json.is_array() && res_data_json.as_array().unwrap().len() == 0 {
                 return Err(Error::new(ErrorKind::Other, "没有该订单!"));
             }
+
             let result = format_order_item(res_data_json.as_array().unwrap()[0].clone(), ct_val);
+
+            info!("原始订单信息{:?}, 格式化后信息{:?}", res_data_json, result);
+
             Ok(result)
         } else {
             Err(Error::new(ErrorKind::Other, res_data.to_string()))
@@ -632,8 +636,8 @@ impl Platform for BybitSwap {
             let handle = tokio::spawn(async move {
                 let result = self_clone.cancel_order(&order_id, &custom_id).await;
                 match result {
-                    Ok(order) => {
-                        self_clone.order_sender.send(order).await.unwrap();
+                    Ok(_order) => {
+                        // self_clone.order_sender.send(order).await.unwrap();
                     }
                     Err(error) => {
                         // 取消失败去查订单。