Administrator
2023-12-06 3fcc78b99c2a05d0af5dd76d013fd32d0b388155
bug修复
3个文件已修改
43 ■■■■■ 已修改文件
l2/l2_data_manager_new.py 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
output/code_info_output.py 7 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
test/l2_trade_test.py 35 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
l2/l2_data_manager_new.py
@@ -237,6 +237,7 @@
    __L2MarketSellManager = L2MarketSellManager()
    __L2LimitUpSellManager = L2LimitUpSellManager()
    __PlaceOrderCountManager = PlaceOrderCountManager()
    __CodeNatureRecordManager = code_nature_analyse.CodeNatureRecordManager()
    # 获取代码评分
    @classmethod
output/code_info_output.py
@@ -104,8 +104,11 @@
                                                                                    volume_rate),
                                                                                None)
        # 是否可以买入的信息
        can_buy_info = l2.l2_data_manager_new.L2TradeDataProcessor.can_buy_first(code, limit_up_price)
        params["trade_data"]["can_buy_info"] = can_buy_info
        try:
            can_buy_info = l2.l2_data_manager_new.L2TradeDataProcessor.can_buy_first(code, limit_up_price)
            params["trade_data"]["can_buy_info"] = can_buy_info
        except:
            pass
        __base_L2PlaceOrderParamsManager = l2_trade_factor.L2PlaceOrderParamsManager(code, False, volume_rate,
                                                                                     code_volumn_manager.get_volume_rate_index(
test/l2_trade_test.py
@@ -85,11 +85,11 @@
                except Exception as e:
                    pass
    @unittest.skip("跳过此单元测试")
    # @unittest.skip("跳过此单元测试")
    def test_trade(self):
        trade_manager.TradeStateManager().open_buy()
        threading.Thread(target=async_log_util.run_sync, daemon=True).start()
        code = "002848"
        code = "603161"
        clear_trade_data(code)
        l2.l2_data_util.load_l2_data(code)
        total_datas = deepcopy(l2.l2_data_util.local_today_datas[code])
@@ -136,6 +136,10 @@
        # pos_list.insert(75, (472, 488))
        # pos_list.insert(84, (516, 532))
        # hook
        tool.get_now_time_str = mock.Mock(return_value="09:35:00")
        CodePlateKeyBuyManager.can_buy = mock.Mock(return_value=(["测试"], False, ""))
        # 获取交易进度
        trade_progress_list, buy_queues = log_export.get_trade_progress(code)
        trade_progress_list.reverse()
@@ -177,17 +181,19 @@
                    break
            print("----------------处理位置", indexs)
            for l2_m in l2_market_datas:
                if int(str(l2_m["dataTimeStamp"])[:-3]) < int(total_datas[indexs[0]]["val"]["time"].replace(":", "")):
                    time_str = f"{l2_m['dataTimeStamp']}"
                    if time_str.startswith("9"):
                        time_str = "0" + time_str
                    time_str = time_str[:6]
                    time_str = f"{time_str[0:2]}:{time_str[2:4]}:{time_str[4:6]}"
                    L2MarketSellManager().set_current_total_sell_data(code, time_str,
                                                                      l2_m["totalAskVolume"] * l2_m["avgAskPrice"],
                                                                      l2_m["totalAskVolume"])
                    break
            if l2_market_datas:
                for l2_m in l2_market_datas:
                    if int(str(l2_m["dataTimeStamp"])[:-3]) < int(
                            total_datas[indexs[0]]["val"]["time"].replace(":", "")):
                        time_str = f"{l2_m['dataTimeStamp']}"
                        if time_str.startswith("9"):
                            time_str = "0" + time_str
                        time_str = time_str[:6]
                        time_str = f"{time_str[0:2]}:{time_str[2:4]}:{time_str[4:6]}"
                        L2MarketSellManager().set_current_total_sell_data(code, time_str,
                                                                          l2_m["totalAskVolume"] * l2_m["avgAskPrice"],
                                                                          l2_m["totalAskVolume"])
                        break
            for tp in trade_progress_list:
                if int(tp[1].replace(":", "")) < int(total_datas[indexs[0]]["val"]["time"].replace(":", "")):
@@ -217,7 +223,8 @@
    # @unittest.skip("跳过此单元测试")
    def test_block(self):
        code = "002036"
        KPLCodeJXBlockManager().load_jx_blocks(code, 11.83, 11.83, kpl_data_manager.KPLLimitUpDataRecordManager.get_current_reasons())
        KPLCodeJXBlockManager().load_jx_blocks(code, 11.83, 11.83,
                                               kpl_data_manager.KPLLimitUpDataRecordManager.get_current_reasons())
        block_info.init_code(code)
        kpl_data_manager.KPLLimitUpDataRecordManager.load_total_datas()