From 298be0f7e061200e76eeaa8c662b6c116c4f00f4 Mon Sep 17 00:00:00 2001 From: Administrator <admin@example.com> Date: 星期一, 25 八月 2025 15:39:37 +0800 Subject: [PATCH] 委托记录接口修改 --- test/l2_trade_test.py | 24 +++++++++++++++--------- 1 files changed, 15 insertions(+), 9 deletions(-) diff --git a/test/l2_trade_test.py b/test/l2_trade_test.py index 8da162a..1e372e5 100644 --- a/test/l2_trade_test.py +++ b/test/l2_trade_test.py @@ -17,16 +17,14 @@ from l2.l2_sell_manager import L2MarketSellManager from l2.l2_transaction_data_manager import HuaXinSellOrderStatisticManager from log_module import log, log_export, async_log_util -from trade.huaxin import huaxin_trade_api -from trade.radical_buy_data_manager import RedicalBuyDataManager +from trade.buy_radical.radical_buy_data_manager import RadicalBuyDataManager, RadicalBuyBlockManager from utils import tool, init_data_util from db import redis_manager_delegate as redis_manager from l2 import l2_log, l2_data_manager, transaction_progress, l2_data_manager_new, l2_transaction_data_processor, \ cancel_buy_strategy from l2.transaction_progress import TradeBuyQueue from third_data import kpl_util, kpl_data_manager, block_info -from third_data.code_plate_key_manager import LimitUpCodesPlateKeyManager, CodePlateKeyBuyManager, \ - RadicalBuyBlockManager +from third_data.code_plate_key_manager import LimitUpCodesPlateKeyManager from third_data.kpl_data_manager import KPLDataManager from trade import trade_data_manager, current_price_process_manager, l2_trade_util, trade_manager import l2.l2_data_manager_new, l2.l2_data_manager, l2.l2_data_util, l2.cancel_buy_strategy @@ -159,7 +157,7 @@ limit_up_price = gpcode_manager.get_limit_up_price(code) if limit_up_price is None: init_data_util.re_set_price_pre(code) - current_price_process_manager.set_trade_price(code, round(float(gpcode_manager.get_limit_up_price(code)), 2)) + current_price_process_manager.set_trade_price(code, gpcode_manager.get_limit_up_price_as_num(code)) pss_server, pss_strategy = multiprocessing.Pipe() # huaxin_trade_api.run_pipe_trade(pss_server, None, None) @@ -239,7 +237,7 @@ # @unittest.skip("璺宠繃姝ゅ崟鍏冩祴璇�") def test_block(self): - codes_str = "603778" + codes_str = "300390" codes = codes_str.split(",") # ["002889", "300337", "001298", "002771"] kpl_data_manager.KPLLimitUpDataRecordManager.load_total_datas() kpl_data_manager.KPLLimitUpDataRecordManager.save_record(tool.get_now_date_str(), @@ -278,7 +276,7 @@ result = RadicalBuyBlockManager.is_radical_buy(code, yesterday_codes) print(code, result) if result[0]: - can_buy_result = RedicalBuyDataManager.can_buy(code) + can_buy_result = RadicalBuyDataManager.is_code_can_buy(code) if can_buy_result[0]: print("鍙互涔�", code, result) else: @@ -318,15 +316,23 @@ for d in fdatas: l2_transaction_data_processor.HuaXinTransactionDatasProcessor().process_huaxin_transaction_datas(code, d) + def test_cancel(self): + code = "002383" + l2.l2_data_util.load_l2_data(code) + TradeBuyQueue.get_traded_index = mock.Mock(return_value=(21836, False)) + l2.cancel_buy_strategy.RDCancelBigNumComputer._RDCancelBigNumComputer__watch_indexes_cache = { + code: {21851, 21844, 21854}} + l2.cancel_buy_strategy.RDCancelBigNumComputer().need_cancel(code, 22197, 22217) + class TestTradedProgress(unittest.TestCase): @unittest.skip("璺宠繃姝ゅ崟鍏冩祴璇�") def test_get_progress(self): - code = "000925" + code = "002383" l2.l2_data_util.load_l2_data(code) # l2.l2_data_util.local_today_datas[code] = l2.l2_data_util.local_today_datas[code][:898] - TradeBuyQueue.get_traded_index = mock.Mock(return_value=(10, False)) + TradeBuyQueue.get_traded_index = mock.Mock(return_value=(21836, False)) buy_progress_index = TradeBuyQueue().compute_traded_index(code, "9.76", [9999, 1506], "09:32:45") print("鑾峰彇鍒颁氦鏄撹繘搴︼細", buy_progress_index) -- Gitblit v1.8.0