fix prev short order doesnot auto sell with profit win

rainfu · May 31, 2023 · 544d33a · 544d33a
1 parent e8ec698
commit 544d33a
Show file tree

Hide file tree

Showing 3 changed files with 29 additions and 7 deletions.
diff --git a/commands/trade.js b/commands/trade.js
@@ -226,7 +226,8 @@ module.exports = function (program, conf) {
                             action: s.symbols[b.product_id]["last_buy_type"],
                             profit: 0,
                             usdtProfit: 0,
-                            position_side: b.positionSide,
+                            position_side:
+                              b.positionSide === "SHORT" ? "short" : "long",
                           });
                           s.symbols[b.product_id].last_trade_time = orderTime;
                           s.symbols[b.product_id].sell_stop = n(b.entry_price)

diff --git a/lib/engine.js b/lib/engine.js
@@ -309,7 +309,14 @@ module.exports = function (s, conf, core) {
             s.symbols[symbol.product_id].leverage;
         }
       }
-      // logger.warn('executeStop do_sell_stop ' + !s.symbols[symbol.product_id].inSignal, !s.symbols[symbol.product_id].acted_on_stop, s.symbols[symbol.product_id].last_buy_type, s.symbols[symbol.product_id].last_buy_price, s.symbols[symbol.product_id].sell_stop, s.symbols[symbol.product_id].period.close)
+      logger.warn(
+        symbol.product_id +
+          " executeStop do_sell_stop " +
+          " " +
+          s.symbols[symbol.product_id].last_buy_type +
+          " " +
+          s.symbols[symbol.product_id].last_trade_worth
+      );
       if (
         !s.symbols[symbol.product_id].inSignal &&
         !s.symbols[symbol.product_id].acted_on_stop
@@ -369,6 +376,12 @@ module.exports = function (s, conf, core) {
         }
         if (!stop_signal && so.profit_win_enable) {
           stop_signal = profitStop.checkProfitWin(symbol);
+          /* logger.warn(
+            symbol.product_id +
+              " executeStop profit_win_enable " +
+              " " +
+              s.symbols[symbol.product_id].stop_signal
+          ); */
           if (stop_signal) {
             console.log(
               (
@@ -508,7 +521,7 @@ module.exports = function (s, conf, core) {
                   },
                   function (err, res) {
                     if (err) return;
-                    console.log(
+                    logger.debug(
                       symbol.product_id.cyan +
                         " updateLeverage from " +
                         s.symbols[symbol.product_id].leverage +
@@ -532,7 +545,7 @@ module.exports = function (s, conf, core) {
         }
       );
     } catch (error) {
-      console.log("get banance error", error);
+      logger.error("get banance error" + error);
     }
   }
   function initExchange(cb, position_side = "LONG") {
@@ -694,7 +707,7 @@ module.exports = function (s, conf, core) {
       liquid &&
       parseInt(liquid) <= parseInt(s.options.defi.dailyVolumeUSD)
     ) {
-      console.log(
+      logger.warn(
         "isOrderLiquidityTooSmall",
         liquid,
         parseInt(s.options.defi.dailyVolumeUSD)

diff --git a/lib/profit.js b/lib/profit.js
@@ -1,4 +1,5 @@
-module.exports = function profit(s) {
+module.exports = function profit(s, conf) {
+  let logger = conf.logger;
   return {
     getProfitStopPrice: function (symbol) {
       let profit_stop = 0;
@@ -59,7 +60,14 @@ module.exports = function profit(s) {
     checkProfitWin: function (symbol) {
       let stop_signal = false;
       //  console.log('s.symbols[symbol.product_id].profit_stop_high', s.symbols[symbol.product_id].profit_stop_high)
-      // console.log('\nprofit_win_first_rate', s.symbols[symbol.product_id].action, s.options.profit_win_first_rate / 100, s.symbols[symbol.product_id].last_trade_worth, s.symbols[symbol.product_id].last_trade_worth >= s.options.profit_win_first_rate / 100)
+      logger.debug(
+        "checkProfitWin",
+        s.symbols[symbol.product_id].action,
+        s.options.profit_win_first_rate / 100,
+        s.symbols[symbol.product_id].last_trade_worth,
+        s.symbols[symbol.product_id].last_trade_worth >=
+          s.options.profit_win_first_rate / 100
+      );
       if (
         !s.symbols[symbol.product_id].has_profit_win_first_sell &&
         s.symbols[symbol.product_id].action &&