Merge branch 'master' into feat_option_timezone

Author: tigersk

tigeropen/examples/quote_client_demo.py

@@ -230,15 +230,15 @@ def test_market_scanner():
                 base_filter1_value = item[base_filter1]
                 accumulate_filter_value = item[accumulate_filter]
                 print(
-                    f'page:{result.startt}, symbol:{symbol}, base_filter1 value:{base_filter1_value}, accumulate_filter value:{accumulate_filter_value}')
+                    f'page:{result.page}, symbol:{symbol}, base_filter1 value:{base_filter1_value}, accumulate_filter value:{accumulate_filter_value}')
             print(f'current page symbols:{result.symbols}')
             scanner_result_symbols.update(result.symbols)
         time.sleep(1)
         # 处理分页
-        if result.startt >= result.total_page - 1:
+        if result.page >= result.total_page - 1:
             is_last_page = True
         else:
-            begin_page = result.startt + 1
+            begin_page = result.page + 1
 
     print(f'scanned symbols:{scanner_result_symbols}')
 

tigeropen/quote/quote_client.py

@@ -1809,10 +1809,10 @@ def get_warrant_filter(self, symbol, page=None, page_size=None, sort_field_name=
         :param filter_params: tigeropen.quote.request.model.WarrantFilterParams
         :return:
         """
-        params = WarrantFilterParams()
+        params: WarrantFilterParams = WarrantFilterParams()
         params.lang = get_enum_value(self._lang)
         params.symbol = symbol or (filter_params.symbol if filter_params else None)
-        params.page = page or (filter_params.startt if filter_params else None)
+        params.page = page or (filter_params.page if filter_params else None)
         params.page_size = page_size or (filter_params.page_size if filter_params else None)
         params.sort_field_name = sort_field_name or (filter_params.sort_field_name if filter_params else None)
         params.sort_dir = get_enum_value(sort_dir or (filter_params.sort_dir if filter_params else None))

tigeropen/trade/request/model.py

@@ -1620,11 +1620,11 @@ def end_date(self, value):
         self._end_date = value
 
     @property
-    def startt(self):
+    def start(self):
         return self._start
 
-    @startt.setter
-    def startt(self, value):
+    @start.setter
+    def start(self, value):
         self._start = value
 
     @property

tigeropen/trade/trade_client.py

@@ -954,7 +954,7 @@ def get_fund_details(self, seg_types, account=None, fund_type=None, currency=Non
             params.seg_types = seg_types_params
         params.fund_type = get_enum_value(fund_type)
         params.currency = get_enum_value(currency)
-        params.startt = start
+        params.start = start
         params.limit = limit
         params.start_date = start_date
         params.end_date = end_date