将华鑫订单交易成功独立出来处理

Administrator

2023-09-25 c0bcfe746b97bc126636a658b1f01fc6a51f9f95

 trade/huaxin/huaxin_trade_api_server.py

@@ -24,6 +24,7 @@
from trade.huaxin import huaxin_trade_api, huaxin_trade_record_manager, \
    huaxin_trade_data_update
from trade.huaxin.huaxin_trade_api import ClientSocketManager
from trade.huaxin.huaxin_trade_order_processor import TradeResultProcessor, HuaxinOrderEntity
from utils import socket_util, tool, huaxin_util, data_export_util


@@ -116,12 +117,9 @@
                                            # 交易所拒绝
                                            raise Exception(resultJSON['statusMsg'])
                                        else:
                                            trade_huaxin.order_success(resultJSON['securityId'],
                                                                       resultJSON['accountID'],
                                                                       resultJSON['orderSysID'],
                                                                       resultJSON['orderRef'],
                                                                       resultJSON['insertTime']
                                                                       )
                                            # code, orderStatus, orderRef, accountID, orderSysID, insertTime=None
                                            order = HuaxinOrderEntity(resultJSON['securityId'],statusCode,resultJSON['orderRef'],resultJSON['accountID'],resultJSON['orderSysID'],resultJSON['insertTime'])
                                            TradeResultProcessor.order_success(order)
                                            return_str = json.dumps({"code": 0})
                                    finally:
                                        # 更新委托列表
@@ -148,7 +146,7 @@
                            if result["code"] == 0:
                                if result["data"]["cancel"] == 1:
                                    # 撤单成功
                                    trade_huaxin.cancel_order_success(code, accountId, orderSysID)
                                    TradeResultProcessor.cancel_order_success(code, accountId, orderSysID)
                                    return_str = json.dumps({"code": 0})
                                else:
                                    # 撤单失败