|
|
@@ -369,10 +369,10 @@ class ArbitrageProcess:
|
|
|
exchange_buy_order_formated = pformat(exchange_buy_order, indent=2)
|
|
|
|
|
|
msg = f"[{order_times}]交易所现货买入订单已发送 \n params:{order_params_formated} \n rst: {exchange_buy_order_formated}"
|
|
|
+ logger.info(msg)
|
|
|
+ add_state_flow_entry(self.process_item, self.current_state, msg, "success")
|
|
|
+
|
|
|
if 'orderId' not in exchange_buy_order:
|
|
|
- logger.error(msg)
|
|
|
- add_state_flow_entry(self.process_item, self.current_state, msg, "fail")
|
|
|
-
|
|
|
continue
|
|
|
|
|
|
# 查询交易所订单状态
|
|
|
@@ -384,6 +384,7 @@ class ArbitrageProcess:
|
|
|
"orderId": exchange_buy_order_id
|
|
|
}
|
|
|
order = mexc.trade.get_order(params)
|
|
|
+ order_formated = pformat(order, indent=2)
|
|
|
|
|
|
if order['status'] in ["FILLED", "PARTIALLY_CANCELED"]:
|
|
|
# 以实际成交数量为准
|
|
|
@@ -394,7 +395,6 @@ class ArbitrageProcess:
|
|
|
self.buy_price = self.buy_value / self.already_bought_amount
|
|
|
self.buy_price = self.buy_price.quantize(self.price_precision, rounding=ROUND_DOWN)
|
|
|
|
|
|
- order_formated = pformat(order, indent=2)
|
|
|
msg = f"交易所现货买入订单已完成, 价格:{self.buy_price}, money: {money}\n order: {order_formated}"
|
|
|
logger.info(msg)
|
|
|
add_state_flow_entry(self.process_item, self.current_state, msg, "success")
|
|
|
@@ -402,6 +402,10 @@ class ArbitrageProcess:
|
|
|
self.exchange_withdrawal_amount = self.already_bought_amount
|
|
|
break
|
|
|
else:
|
|
|
+ msg = f"交易所现货买入订单失败\n order: {order_formated}"
|
|
|
+ logger.error(msg)
|
|
|
+ add_state_flow_entry(self.process_item, self.current_state, msg, "fail")
|
|
|
+
|
|
|
time.sleep(1)
|
|
|
waiting_times = waiting_times - 1
|
|
|
|