From 83a11a703a1afbf0600fd05cc24b30c886082945 Mon Sep 17 00:00:00 2001 From: Sik Yoon Date: Sat, 9 Dec 2023 21:56:04 +0900 Subject: [PATCH] Change print selling message --- src/coex/order_team.rs | 8 +++----- src/strategy_team/strategy_004.rs | 14 +++----------- 2 files changed, 6 insertions(+), 16 deletions(-) diff --git a/src/coex/order_team.rs b/src/coex/order_team.rs index fe2f3bd..c73bc8a 100644 --- a/src/coex/order_team.rs +++ b/src/coex/order_team.rs @@ -996,6 +996,7 @@ pub async fn monitoring_filled_sell_order( for element in filled_sell_orders { // build insert value let pure_profit_usdt = decimal_sub(element.get_usdt_fee_adjusted, element.used_usdt); + let pure_profit_percent = decimal_mul(decimal_div(pure_profit_usdt, element.used_usdt), dec!(100)); insert_value_build.clear(); insert_value_build.push(element.symbol.clone()); // symbol insert_value_build.push(server_epoch.to_string()); // soldtime @@ -1004,10 +1005,7 @@ pub async fn monitoring_filled_sell_order( insert_value_build.push(element.buy_price.to_string()); // buy_price insert_value_build.push(element.sell_price.to_string()); // sell_price insert_value_build.push(element.base_qty_ordered.to_string()); // base_qty - insert_value_build.push( - decimal_mul(decimal_div(pure_profit_usdt, element.used_usdt), dec!(100)) - .to_string(), - ); // pure_profit_percent + insert_value_build.push(pure_profit_percent.to_string()); // pure_profit_percent insert_value_build.push(pure_profit_usdt.to_string()); // pure_profit_usdt insert_value_build.push(element.registerer.to_string()); // registerer insert_value_container.push(insert_value_build.clone()); @@ -1050,7 +1048,7 @@ pub async fn monitoring_filled_sell_order( delete_record(&delete_table_name, &delete_condition).await; // total_get_usdt = decimal_add(total_get_usdt, element.get_usdt_fee_adjusted); - println!("sell {}", element.symbol); + println!("sell {}: {:.2}%", element.symbol, pure_profit_percent); } // update profit_percent in [achievement_evaluation] diff --git a/src/strategy_team/strategy_004.rs b/src/strategy_team/strategy_004.rs index 42c023b..3bc1f78 100644 --- a/src/strategy_team/strategy_004.rs +++ b/src/strategy_team/strategy_004.rs @@ -276,7 +276,7 @@ pub async fn list_up_for_buy( } try_join_all(task_vec).await?; - // 6th filtering: 0.5% <= the average amplitude of the latest 10 30m candles <= 2% + // 6th filtering: 0.5% <= the average amplitude of the latest 10 30m candles <= 1.5% let filtered_data_5th_c = filtered_data_5th_arc.lock().await.clone(); let mut filtered_data_6th: Vec = Vec::new(); let mut filtered_data_6th_arc: Arc>> = @@ -285,7 +285,7 @@ pub async fn list_up_for_buy( for element in filtered_data_5th_c { let mut supertrend_vec: Vec = Vec::new(); let rt_price_30m_vec_c = alldata.rt_price_30m_vec.clone(); - let filtered_data_6th_arc_c = Arc::clone(&filtered_data_5th_arc); + let filtered_data_6th_arc_c = Arc::clone(&filtered_data_6th_arc); task_vec.push(tokio::spawn(async move { let position_idx = rt_price_30m_vec_c.iter().position(|elem| elem.0 == element.symbol); @@ -302,7 +302,7 @@ pub async fn list_up_for_buy( } average_amplitude /= 10.0; - if 0.005 <= average_amplitude && average_amplitude <= 0.02 { + if 0.005 <= average_amplitude && average_amplitude <= 0.015 { let mut filtered_data_6th_lock = filtered_data_6th_arc_c.lock().await; let mut filtered_data = FilteredData::new(); filtered_data.symbol = element.symbol.clone(); @@ -472,10 +472,6 @@ pub async fn list_up_for_sell( if element.current_price >= element.target_price && element.pure_profit_percent >= 0.1 { - println!( - "target selling {} {:.2}", - element.symbol, element.pure_profit_percent - ); limit_order_sell( &element, element.current_price, @@ -486,10 +482,6 @@ pub async fn list_up_for_sell( ) .await; } else if element.current_price <= element.stoploss { - println!( - "stoploss selling {} {:.2}", - element.symbol, element.pure_profit_percent - ); limit_order_sell( &element, element.current_price,