From 1d984faf7a3f0bfce557fa03412519fa70928f66 Mon Sep 17 00:00:00 2001 From: lhr <lhr@example.com> Date: 星期二, 25 六月 2024 17:04:25 +0800 Subject: [PATCH] Merge branch 'master' of http://193.112.35.168:10101/r/gp_low_suction --- local_api/juejin.py | 32 +++++++++++++++++++++++++++++++- 1 files changed, 31 insertions(+), 1 deletions(-) diff --git a/local_api/juejin.py b/local_api/juejin.py index e3f9098..52f228e 100644 --- a/local_api/juejin.py +++ b/local_api/juejin.py @@ -54,7 +54,30 @@ 鎸佷粨鏌ヨ :return: """ - return self.context.account().positions() + try: + return self.context.account().positions() + except: + return [] + + def queryUnfinishOrders(self): + """ + 鏌ヨ鏈畬鎴愬鎵� + :return: + """ + try: + return get_unfinished_orders() + except: + return [] + + def cancelOrders(self, local_id, account_id): + """ + 鎾ゅ崟 + :param local_id: 鏈湴璁㈠崟ID + :param account_id: 璐﹀彿ID + :return: + """ + async_log_util.info(logger_trade, f"鎾ゅ崟锛歿local_id}-{account_id}") + return order_cancel([{"cl_ord_id": local_id, "account_id": account_id}]) __JueJinTradeManager = JueJinTradeManager() @@ -75,6 +98,7 @@ def on_execution_report(context, execrpt): logger_trade.info(f"on_execution_report锛歿execrpt}") logger_print.info(f"on_execution_report锛歿execrpt}") + def on_error(context, execrpt): logger_print.info(f"on_error锛歿execrpt}") @@ -98,6 +122,12 @@ elif type == 'position': results = __JueJinTradeManager.queryPosition() __send_request_response(request_id, results) + elif type == 'get_unfinish_orders': + results = __JueJinTradeManager.queryUnfinishOrders() + __send_request_response(request_id, results) + elif type == 'cancel_order': + __JueJinTradeManager.cancelOrders(data["local_order_id"], data["account_id"]) + __send_request_response(request_id, {}) except Exception as e: logger_print.exception(e) -- Gitblit v1.8.0