skyfffire 3 месяцев назад
Родитель
Сommit
ab942f1626
2 измененных файлов с 9 добавлено и 9 удалено
  1. 1 1
      mexc_client.py
  2. 8 8
      s_erc20_to_mexc.py

+ 1 - 1
mexc_client.py

@@ -513,7 +513,7 @@ if __name__ == '__main__':
                 for order in open_orders:
                     print(f"    - 订单 ID: {order.get('orderId')}, 价格: {order.get('price')}")
 
-                    # print(client.trade.delete_order(params={"symbol": "RATOUSDT", "orderId": order.get('orderId')}))
+                    # print(client.trade.delete_order(params={"symbol": "APETHUSDT", "orderId": order.get('orderId')}))
             else:
                 print(f"  挂单响应: {open_orders}")
 

+ 8 - 8
s_erc20_to_mexc.py

@@ -475,7 +475,7 @@ class ArbitrageProcess:
                                         self._set_state(self.STATE_FAILED)
                                         return
                                     else:
-                                        msg = f"交易所剩余{self.base_coin}: {free_balance}, 准备使用 {pseudo_value_to_buy}, 挂单价格{ready_order_price}, 余额校验通过。"
+                                        msg = f"交易所剩余{self.base_coin}: {free_balance}, 准备使用 {pseudo_value_to_buy}, 买一{bid1_price}, 挂单价格{ready_order_price}, 余额校验通过。"
                                         logger.info(msg)
                                         add_state_flow_entry(self.process_item, self.current_state, msg, "success")
                                         break
@@ -511,7 +511,7 @@ class ArbitrageProcess:
                             order_error_times = order_error_times + 1
                         else:
                             self.exchange_buy_order_id = exchange_buy_order['orderId']
-                            order_price = bid1_price
+                            order_price = ready_order_price
                     # 有订单时的逻辑
                     else:
                         # 获取订单状态,直到完全成交或超时
@@ -539,17 +539,17 @@ class ArbitrageProcess:
                             exchange_buy_order = None
                         
                         # 如果没有成交或取消则判断是否达到取消条件了,这里面不能置空
-                        elif order_price != bid1_price:
+                        elif order_price < bid1_price:
                             params = {
                                 "symbol": self.symbol.replace('_', ''),
                                 "orderId": self.exchange_buy_order_id
                             }
-                            mexc.trade.delete_order(params)
-                            # delete_order_formated = pformat(delete_order, indent=2)
+                            _deleteed_order = mexc.trade.delete_order(params)
+                            deleteed_order_formated = pformat(_deleteed_order, indent=2)
 
-                            # msg = f"【WARNING】价格变化,重新挂单\n order: {order_formated}"
-                            # logger.warning(msg)
-                            # add_state_flow_entry(self.process_item, self.current_state, msg, "success")
+                            msg = f"【WARNING】价格变化, 重新挂单, order price {order_price}, bid1_price {bid1_price} \n order: {deleteed_order_formated}"
+                            logger.warning(msg)
+                            add_state_flow_entry(self.process_item, self.current_state, msg, "success")
                 except Exception as e:
                     exc_traceback = traceback.format_exc()
                     msg = f"请求价格接口时出现错误\n{exc_traceback}"