bug修复

Administrator

2023-07-27 cda53e53c3b1c92d289b234a3a0106e66e2cac38

 third_data/code_plate_key_manager.py

@@ -366,7 +366,7 @@
    # yesterday_current_limit_up_codes ： 昨日涨停代码
    # before_blocks_dict：历史涨停原因
    @classmethod
    def get_can_buy_block(cls, code, current_limit_up_datas, limit_up_record_datas,yesterday_current_limit_up_codes,
    def get_can_buy_block(cls, code, current_limit_up_datas, limit_up_record_datas, yesterday_current_limit_up_codes,
                          before_blocks_dict):
        # 加载涨停代码的目标板块
        def load_code_block():
@@ -410,12 +410,13 @@
        load_code_block()
        msg_list = []
        for block in keys:
            is_top_8_record, top_8_record = kpl_block_util.is_record_top_block(code, block, limit_up_record_datas, yesterday_current_limit_up_codes,8)
            is_top_8_record, top_8_record = kpl_block_util.is_record_top_block(code, block, limit_up_record_datas,
                                                                               yesterday_current_limit_up_codes, 20)
            is_top_4_current, top_4_current = kpl_block_util.is_current_top_block(code, block, current_limit_up_datas,
                                                                                  yesterday_current_limit_up_codes, 4)
                                                                                  yesterday_current_limit_up_codes, 10)
            is_top_4 = is_top_8_record and is_top_4_current
            msg_list.append(f"\n实时top4: {top_4_current}(涨停数量：{len(current_limit_up_datas)})")
            msg_list.append(f"历史top8: {top_8_record}")
            msg_list.append(f"\n实时top10: {top_4_current}(涨停数量：{len(current_limit_up_datas)})")
            msg_list.append(f"历史top20: {top_8_record}")

            # 获取主板实时身位
            current_shsz_rank = kpl_block_util.get_code_current_rank(code, block, current_limit_up_datas,
@@ -424,16 +425,16 @@
                                                                   code_limit_up_reason_dict, shsz=True)
            # 获取主板历史身位
            if is_top_4:
                is_open_limit_up, msg = kpl_block_util.is_shsz_open_limit_up(code, block, limit_up_record_datas,
                                                                             code_limit_up_reason_dict)
                if is_open_limit_up:
                pen_limit_up_codes = kpl_block_util.get_shsz_open_limit_up_codes(code, block, limit_up_record_datas,
                                                                                 code_limit_up_reason_dict)
                if pen_limit_up_codes:
                    # 主板开1
                    if current_shsz_rank < 2 and record_shsz_rank < 2:
                    if current_shsz_rank < len(pen_limit_up_codes) + 1 and record_shsz_rank < len(pen_limit_up_codes) + 1:
                        # 属于龙1,龙2
                        return block, f"{block}：top4涨停板块，主板开1,属于龙1/龙2(实时身位-{current_shsz_rank})"
                        return block, f"{block}：top4涨停板块，主板开1({pen_limit_up_codes}),属于主板前龙{len(pen_limit_up_codes) + 1}(实时身位-{current_shsz_rank})"
                    else:
                        msg_list.append(
                            f"板块-{block}: top4涨停板块，主板开1（{msg}）,不为主板龙1龙2（实时身位-{current_shsz_rank},历史身位-{record_shsz_rank}）")
                            f"板块-{block}: top4涨停板块，主板开1（{pen_limit_up_codes}）,不为主板前龙{len(pen_limit_up_codes) + 1}（实时身位-{current_shsz_rank},历史身位-{record_shsz_rank}）")
                        continue
                else:
                    if current_shsz_rank == 0 and record_shsz_rank < 2:
@@ -462,12 +463,14 @@
    # 是否可以下单
    # 返回：是否可以下单,消息,板块类型
    @classmethod
    def can_buy(cls, code, current_limit_up_datas, limit_up_record_datas, yesterday_current_limit_up_codes,before_blocks_dict):
    def can_buy(cls, code, current_limit_up_datas, limit_up_record_datas, yesterday_current_limit_up_codes,
                before_blocks_dict):
        if constant.TEST:
            return True, "", cls.BLOCK_TYPE_NONE

        block, block_msg = cls.get_can_buy_block(code, current_limit_up_datas,
                                                 limit_up_record_datas,yesterday_current_limit_up_codes, before_blocks_dict)
                                                 limit_up_record_datas, yesterday_current_limit_up_codes,
                                                 before_blocks_dict)
        if block is None:
            return False, block_msg