From 87f2f8141efd68114b929b04d26f2de9bdee3aa4 Mon Sep 17 00:00:00 2001
From: "vn.py" <xiaoyou.chen@foxmail.com>
Date: Tue, 16 Jul 2019 09:10:45 +0800
Subject: [PATCH] [Mod]add data filter when query trading account data

---
 vnpy/gateway/ctp/ctp_gateway.py         |  3 +++
 vnpy/gateway/ctptest/ctptest_gateway.py |  3 +++
 vnpy/gateway/mini/mini_gateway.py       | 19 ++++++++-----------
 3 files changed, 14 insertions(+), 11 deletions(-)

diff --git a/vnpy/gateway/ctp/ctp_gateway.py b/vnpy/gateway/ctp/ctp_gateway.py
index 30f048dd..a4aa22f9 100644
--- a/vnpy/gateway/ctp/ctp_gateway.py
+++ b/vnpy/gateway/ctp/ctp_gateway.py
@@ -528,6 +528,9 @@ class CtpTdApi(TdApi):
     
     def onRspQryTradingAccount(self, data: dict, error: dict, reqid: int, last: bool):
         """"""
+        if "AccountID" not in data:
+            return
+
         account = AccountData(
             accountid=data["AccountID"],
             balance=data["Balance"],
diff --git a/vnpy/gateway/ctptest/ctptest_gateway.py b/vnpy/gateway/ctptest/ctptest_gateway.py
index 44d36fa3..3b6bb51d 100644
--- a/vnpy/gateway/ctptest/ctptest_gateway.py
+++ b/vnpy/gateway/ctptest/ctptest_gateway.py
@@ -527,6 +527,9 @@ class CtpTdApi(TdApi):
     
     def onRspQryTradingAccount(self, data: dict, error: dict, reqid: int, last: bool):
         """"""
+        if "AccountID" not in data:
+            return
+
         account = AccountData(
             accountid=data["AccountID"],
             balance=data["Balance"],
diff --git a/vnpy/gateway/mini/mini_gateway.py b/vnpy/gateway/mini/mini_gateway.py
index 523ed3aa..c616be4d 100644
--- a/vnpy/gateway/mini/mini_gateway.py
+++ b/vnpy/gateway/mini/mini_gateway.py
@@ -422,13 +422,9 @@ class MiniTdApi(TdApi):
             self.login_status = True
             self.gateway.write_log("交易服务器登录成功")
             
-            # Confirm settlement
-            req = {
-                "BrokerID": self.brokerid,
-                "InvestorID": self.userid
-            }
+            # Get instrument data directly without confirm settlement
             self.reqid += 1
-            self.reqSettlementInfoConfirm(req, self.reqid)
+            self.reqQryInstrument({}, self.reqid)
         else:
             self.login_failed = True
             
@@ -469,14 +465,12 @@ class MiniTdApi(TdApi):
         """
         Callback of settlment info confimation.
         """
-        self.gateway.write_log("结算信息确认成功")
-        
-        self.reqid += 1
-        self.reqQryInstrument({}, self.reqid)
+        pass
     
     def onRspQryInvestorPosition(self, data: dict, error: dict, reqid: int, last: bool):
         """"""
         if not data:
+            print(data, error, reqid, last)
             return
         
         # Get buffered position object
@@ -528,6 +522,9 @@ class MiniTdApi(TdApi):
     
     def onRspQryTradingAccount(self, data: dict, error: dict, reqid: int, last: bool):
         """"""
+        if "AccountID" not in data:
+            return
+
         account = AccountData(
             accountid=data["AccountID"],
             balance=data["Balance"],
@@ -542,7 +539,7 @@ class MiniTdApi(TdApi):
         """
         Callback of instrument query.
         """
-        product = PRODUCT_MINI2VT.get(data["ProductClass"], None)
+        product = PRODUCT_MINI2VT.get(data.get("ProductClass", None), None)
         if product:            
             contract = ContractData(
                 symbol=data["InstrumentID"],