yu/real_trader
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

添加市价单

Browse Source
This commit is contained in:
zhiyong 2025-05-12 14:33:04 +08:00
parent 97920a0ede
commit c94f226fbc
2 changed files with 23 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/real/real_trader_manager.py
View File

@ -150,7 +150,11 @@ class RealTraderManager:
) )
# 立即更新一次订单状态 # 立即更新一次订单状态
self.check_and_retry(order_id, strategy_name, code, direction, amount, 1) threading.Thread(
target=self.check_and_retry,
args=(order_id, strategy_name, code, direction, amount, 1),
name=f"CheckOrder-{order_id}"
).start()
return {"success": True, "order_id": order_id} return {"success": True, "order_id": order_id}
@ -180,7 +184,11 @@ class RealTraderManager:
new_order_id = new_order.get("order_id") new_order_id = new_order.get("order_id")
if new_order.get("success") and new_order_id: if new_order.get("success") and new_order_id:
# 立即检查新市价单 # 立即检查新市价单
self.check_and_retry(new_order_id, strategy_name, code, direction, left_amount) threading.Thread(
target=self.check_and_retry,
args=(new_order_id, strategy_name, code, direction, left_amount),
name=f"CheckMarketOrder-{new_order_id}"
).start()
return True return True
else: else:
logger.error(f"补单失败: {new_order}") logger.error(f"补单失败: {new_order}")
@ -249,7 +257,7 @@ class RealTraderManager:
time.sleep(3) time.sleep(3)
updated_order = self.trader.get_order(order_id) updated_order = self.trader.get_order(order_id)
if not updated_order: if not updated_order:
logger.error(f"获取订单失败: {order_id}") logger.error(f"获取订单失败, 订单可能正在报单: {order_id}")
return None return None
# 根据委托状态更新订单状态 # 根据委托状态更新订单状态

22
src/trade_server.py
View File

@ -273,6 +273,7 @@ def buy():
strategy_name = data.get( strategy_name = data.get(
"strategy_name", "default_strategy" "strategy_name", "default_strategy"
) # 新增策略名称参数，默认为空 ) # 新增策略名称参数，默认为空
order_type = data.get("order_type", ORDER_TYPE_LIMIT)
try: try:
if not all([code, price_str, amount_str]): if not all([code, price_str, amount_str]):
@ -281,7 +282,7 @@ def buy():
price = float(price_str) price = float(price_str)
amount = int(amount_str) amount = int(amount_str)
if price <= 0 or amount <= 0: if order_type == ORDER_TYPE_LIMIT and (price <= 0 or amount <= 0):
raise ValueError("Price and amount must be positive") raise ValueError("Price and amount must be positive")
# 检查交易系统是否可用 # 检查交易系统是否可用
@ -310,16 +311,16 @@ def buy():
) )
rtm = get_real_trader_manager() rtm = get_real_trader_manager()
result = rtm.place_order( result = rtm.place_order(
strategy_name, code, ORDER_DIRECTION_BUY, amount, price strategy_name, code, ORDER_DIRECTION_BUY, amount, price, order_type
) )
else: else:
result = trader.buy(code, price, amount, strategy_name) result = trader.buy(code, price, amount, strategy_name)
if result.get("success"): if result.get("success"):
logger.info(f"买入成功: {result}") logger.info(f"买入下单成功: {result}")
return jsonify({"success": True, "order_id": result.get("order_id")}), 200 return jsonify({"success": True, "order_id": result.get("order_id")}), 200
else: else:
logger.error(f"买入失败: {result}") logger.error(f"买入下单失败: {result}")
return jsonify({"success": False, "error": result}), 400 return jsonify({"success": False, "error": result}), 400
except ValueError as e: except ValueError as e:
@ -341,6 +342,7 @@ def sell():
price_str = data.get("price") price_str = data.get("price")
amount_str = data.get("amount") amount_str = data.get("amount")
strategy_name = data.get("strategy_name", "") # 新增策略名称参数，默认为空 strategy_name = data.get("strategy_name", "") # 新增策略名称参数，默认为空
order_type = data.get("order_type", ORDER_TYPE_LIMIT)
try: try:
if not all([code, price_str, amount_str]): if not all([code, price_str, amount_str]):
@ -349,7 +351,7 @@ def sell():
price = float(price_str) price = float(price_str)
amount = int(amount_str) amount = int(amount_str)
if price <= 0 or amount <= 0: if order_type == ORDER_TYPE_LIMIT and (price <= 0 or amount <= 0):
raise ValueError("Price and amount must be positive") raise ValueError("Price and amount must be positive")
# 检查交易系统是否可用 # 检查交易系统是否可用
@ -378,19 +380,19 @@ def sell():
) )
rtm = get_real_trader_manager() rtm = get_real_trader_manager()
result = rtm.place_order( result = rtm.place_order(
strategy_name, code, ORDER_DIRECTION_SELL, amount, price strategy_name, code, ORDER_DIRECTION_SELL, amount, price, order_type
) )
else: else:
result = trader.sell(code, price, amount) result = trader.sell(code, price, amount, strategy_name)
if result.get("success"): if result.get("success"):
logger.info(f"卖出成功: {result}") logger.info(f"卖出下单成功: {result}")
return jsonify({"success": True, "order_id": result.get("order_id")}), 200 return jsonify({"success": True, "order_id": result.get("order_id")}), 200
elif "error" in result: elif "error" in result:
logger.error(f"卖出失败: {result}") logger.error(f"卖出下单失败: {result}")
return jsonify({"success": False, "error": result["error"]}), 400 return jsonify({"success": False, "error": result["error"]}), 400
else: else:
logger.error(f"卖出失败: {result}") logger.error(f"卖出下单失败: {result}")
return jsonify({"success": False, "error": result}), 400 return jsonify({"success": False, "error": result}), 400
except ValueError as e: except ValueError as e: