main

src/main.rs

@@ -146,6 +146,7 @@ impl Bot {
     }
 
     async fn order_change_response(&mut self, order_info: Order){
+        eprintln!("---------------响应order: {:?}", order_info);
         if order_info.status.eq("filled") && self.order_info_map.contains_key(&*order_info.id){
             let order: &OrderInfo = self.order_info_map.get(&*order_info.id).unwrap();
             // 1.获取账户信息
@@ -169,7 +170,7 @@ impl Bot {
         // 超300s 需取消的订单
         for (key, order) in &self.order_info_map {
             let order_info: Order = self.exchange.get_okx_order(&self.symbol, &order.id).await.unwrap();
-            eprintln!("order_info: {:?}", order_info);
+            // eprintln!("order_info: {:?}", order_info);
             // 未成交 && 超时
             if !order_info.status.eq("filled") && order.time_num + self.cancel_time_limit < now_time {
                 let is_success = match self.exchange.cancel_okx_order(&self.symbol, &order.id).await {
@@ -234,10 +235,9 @@ impl Bot {
         let order_amount = rl_list.get(index).unwrap().order_amount;
         let order_dict :OrderDict = OrderDict{
             order_amount,
-            buy_price: truncate_decimal_places(rl_list.get(index).unwrap().bid - 100.0, self.price_decimal_places),
+            buy_price: truncate_decimal_places(rl_list.get(index).unwrap().bid, self.price_decimal_places),
             sell_price: truncate_decimal_places(rl_list.get(index).unwrap().ask, self.price_decimal_places)
         };
-        eprintln!("rl_obj: {:?}", rl_list.get(index));
 
         let now_time = OffsetDateTime::now_utc().unix_timestamp();
         // 检测交易间隔，发起交易
@@ -253,6 +253,7 @@ impl Bot {
             time_num: now_time
         };
         eprintln!("buy_order: {:?}", order);
+        eprintln!("rl_obj: {:?}", rl_list.get(index));
         self.order_info_map.insert(buy_order_id, order);
         self.last_buy_time = now_time;
 
@@ -358,4 +359,6 @@ async fn main() {
     });
 
     tokio::try_join!(bot_arc_thread, subscribe_binance_depth_thread, subscribe_order_change_thread).unwrap();
+    // tokio::try_join!(bot_arc_thread, subscribe_order_change_thread).unwrap();
+    // tokio::try_join!(bot_arc_thread, subscribe_binance_depth_thread).unwrap();
 }