bug修复

Administrator

2023-10-11 b6b59a5db39e042d0d173604497ebfa34be47d72

bug修复

 trade/huaxin/huaxin_trade_api.py

@@ -83,6 +83,7 @@


# 设置交易通信队列
# 暂时不会使用该方法
def run_pipe_trade(queue_strategy_r_trade_w_, queue_strategy_w_trade_r_):
    global queue_strategy_w_trade_r
    queue_strategy_w_trade_r = queue_strategy_w_trade_r_
@@ -317,23 +318,6 @@
        async_log_util.info(hx_logger_trade_loop, f"请求响应: request_id-{request_id} 内容-{response}")
        # 主动触发
        __request_response_dict[request_id] = response
        try:
            # 设置替换本地订单号
            if response.get('code') == 0:
                data = response['data']
                # 处理下单
                if data.get('orderStatus') == huaxin_util.TORA_TSTP_OST_Accepted:
                    orderRef = data.get('orderRef')
                    orderSysID = data.get('orderSysID')
                    accountID = data.get('accountID')
                    insertTime = data.get('insertTime')
                    code = data.get('securityId')
                    if orderRef and orderSysID:
                        # 移除本地单号，添加系统单号
                        __TradeOrderIdManager.add_order_id(code, accountID, orderSysID)
                        __TradeOrderIdManager.remove_order_ref(code, orderRef)
        except:
            pass
    else:
        # 被动触发
        pass

 trade/huaxin/huaxin_trade_data_update.py

@@ -50,7 +50,7 @@
                                    insertTime = d.get('insertTime')
                                    acceptTime = d.get('acceptTime')
                                    insertDate = d.get('insertDate')
                                    direction = data.get("direction")
                                    direction = d.get("direction")

                                    order = HuaxinOrderEntity(code, orderStatus, orderRef, accountID, orderSysID,
                                                              insertTime=insertTime, acceptTime=acceptTime,

 trade/huaxin/huaxin_trade_order_processor.py

@@ -152,6 +152,7 @@

    @classmethod
    def order_success(cls, order: HuaxinOrderEntity):
        async_log_util.info(hx_logger_trade_debug, f"处理华鑫订单下单成功：{order.code}, {order.orderRef}, {order.orderSysID}")
        # 加入系统订单号
        cls.__TradeOrderIdManager.add_order_id(order.code, order.accountID, order.orderSysID)
        # 删除临时订单号