diff --git a/example.db b/example.db index 66cbb62..1d7a6ac 100644 Binary files a/example.db and b/example.db differ diff --git a/main_controller.py b/main_controller.py index a67e798..1900022 100644 --- a/main_controller.py +++ b/main_controller.py @@ -219,7 +219,7 @@ class SFGridController(XtQuantTraderCallback): """ # print("on order_error callback") # print(order_error.order_id, order_error.error_id, order_error.error_msg) - print(f"委托报错回调 {order_error.order_remark} {order_error.error_msg}") + print(f"\n委托报错回调 {order_error.order_remark} {order_error.error_msg}") def on_cancel_error(self, cancel_error): """ diff --git a/sfgrid_trade_controller.py b/sfgrid_trade_controller.py index 95a5d2e..07d0005 100644 --- a/sfgrid_trade_controller.py +++ b/sfgrid_trade_controller.py @@ -16,7 +16,7 @@ class StockTradeController: self.currentPosition = getStockPosition(self.tradeTarget.stock_code, self.xt_trader, self.account) self.tradeRecords = strategy_db.TradeRecord.select().where(strategy_db.TradeRecord.stock_code == self.tradeTarget.stock_code).order_by(strategy_db.TradeRecord.trade_time.desc()) - + def enabledTrading(self, enabled: bool): self.tradeTarget.enabled = enabled self.tradeTarget.save() @@ -33,6 +33,7 @@ class StockTradeController: xtconstant.FIX_PRICE, sfgrid_constants.grid_price[self.tradeTarget.grid_index], 'sf_grid', f'{self.tradeTarget.stock_code}_init_buy') + print(f"|- 标的{self.tradeTarget.stock_code}-{self.tradeTarget.stock_name} 建初始仓 买单已发出 InitBuyOrderId: {self.initBuyOrderId} Price: {sfgrid_constants.grid_price[self.tradeTarget.grid_index]} Volume: {sfgrid_constants.grid_volume}\n") def isEnabled(self) -> bool: return self.tradeTarget.enabled diff --git a/starter.py b/starter.py index a315a05..690f400 100644 --- a/starter.py +++ b/starter.py @@ -18,7 +18,7 @@ def startMarketData(): def stopMarketData(): ctrl.stopMarketData() -def targetPool(): +def targets(): ctrl.print_pool() def addTradeTarget(stock_code): @@ -36,6 +36,9 @@ def startTrade(index:int): def pauseTrade(index:int): ctrl.pause_stock_trade(index) +def stockTradeCtrl(index: int): + return ctrl.stock_trade_ctrl[ctrl.instrument_pool[index].stock_code] + def help(): print("可用命令:") print(" ===================================================") @@ -44,9 +47,10 @@ def help(): print(" addTradeTarget(stock_code) - 添加交易标的") print(" accountInfo() - 打印账户信息") print(" positionInfo() - 打印持仓信息") - print(" targetPool() - 打印标的池信息") + print(" targets() - 打印标的池信息") print(" startTrade(index) - 启动标的交易线程") print(" pauseTrade(index) - 暂停标的交易线程") + print(" stockTradeCtrl(index) - 获取标的交易控制器") print(" ===================================================") print(" ctrl - 访问控制器实例")