From d99f8a74c3a5e9af6d295cc6ab7d40ed8dce2fe6 Mon Sep 17 00:00:00 2001
From: Administrator <admin@example.com>
Date: 星期四, 21 十一月 2024 16:30:45 +0800
Subject: [PATCH] 创建客户端日志

---
 api/outside_api_command_callback.py |   12 ++++++------
 1 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/api/outside_api_command_callback.py b/api/outside_api_command_callback.py
index a9143ba..d39d432 100644
--- a/api/outside_api_command_callback.py
+++ b/api/outside_api_command_callback.py
@@ -36,8 +36,7 @@
     logger_real_place_order_position, logger_device
 from output import l2_output_util
 from third_data import kpl_util, history_k_data_manager, huaxin_l1_data_manager, third_blocks_manager, kpl_data_manager
-from third_data.code_plate_key_manager import CodePlateKeyBuyManager, KPLCodeJXBlockManager, RealTimeKplMarketData, \
-    RadicalBuyBlockManager
+from third_data.code_plate_key_manager import  KPLCodeJXBlockManager
 from third_data.history_k_data_manager import HistoryKDataManager
 from third_data.history_k_data_util import JueJinApi, HistoryKDatasUtils
 from third_data.kpl_data_manager import KPLDataManager
@@ -51,6 +50,7 @@
 from trade.huaxin import huaxin_trade_api, huaxin_trade_data_update, \
     huaxin_trade_record_manager, huaxin_trade_order_processor, huaxin_sell_util
 from trade.huaxin.huaxin_trade_record_manager import PositionManager, DealRecordManager, DelegateRecordManager
+from trade.buy_radical.radical_buy_data_manager import RadicalBuyBlockManager
 from trade.sell import sell_manager
 from trade.sell.sell_rule_manager import TradeRuleManager, SellRule
 from trade.trade_manager import TradeTargetCodeModeManager, AutoCancelSellModeManager
@@ -93,7 +93,7 @@
     def __cancel_not_deal_order(self, code, order_ref, timeout=3):
         time.sleep(timeout)
         # 鎾や拱鍗�
-        huaxin_trade_api.cancel_order(1, code, "", orderRef=order_ref)
+        huaxin_trade_api.cancel_order(huaxin_trade_api.TRADE_DIRECTION_BUY, code, "", orderRef=order_ref)
 
     # 浜ゆ槗
     def OnTrade(self, client_id, request_id, data):
@@ -934,7 +934,7 @@
                             limit_up_price = gpcode_manager.get_limit_up_price(code)
                             buy1_money = Buy1PriceManager().get_latest_buy1_money(code)
                             if buy1_money is None:
-                                buy1_money = 0
+                                buy1_money = 1
                             # 鑾峰彇宸茬粡鎴愪氦鐨勫ぇ鍗曟暟閲�
                             total_big_num = 0
                             total_big_count = 0
@@ -1075,7 +1075,7 @@
                                      "pay_attention": need_pay_attention,
                                      "trade_progress_percent": round(
                                          total_left_num * float(limit_up_price) * 100 * 100 / buy1_money, 2),  # 鎴愪氦杩涘害姣斾緥
-                                     "limit_up_price": float(gpcode_manager.get_limit_up_price(code)),
+                                     "limit_up_price": gpcode_manager.get_limit_up_price_as_num(code),
                                      "is_near_big_order": is_near_big_order,
                                      "block": '',
                                      "trade_queue": []
@@ -1210,7 +1210,7 @@
                 # 鑾峰彇澶у崟鎴愪氦鍒楄〃
                 code = data["code"]
                 data_list = BigOrderDealManager().get_total_buy_money_list(code)
-                bigger_money = l2_data_util_old.get_big_money_val(float(gpcode_manager.get_limit_up_price(code)),
+                bigger_money = l2_data_util_old.get_big_money_val(gpcode_manager.get_limit_up_price_as_num(code),
                                                                   tool.is_ge_code(code))
                 fdatas = []
                 for d in data_list:

--
Gitblit v1.8.0