order user remark

Author: tigersk

CHANGELOG.md

@@ -1,3 +1,11 @@
+## 2.1.1 (2022-05-25)
+### New
+- 新增批量分页获取k线接口
+  股票：`QuoteClient.get_bars_by_page`
+  期货：`QuoteClient.get_future_bars_by_page`
+- `QuoteClient.get_future_bars`, `QuoteClient.get_bars` 增加 `page_token` 参数，可用于分页请求定位下一页位置
+- `tigeropen.trade.domain.order.Order` 新增 `user_mark` 属性，用户下单时可传入一定长度的备注信息，该属性值在查询订单时会返回。(需用户提前向平台申请配置)
+
 ## 2.1.0 (2022-05-07)
 ### New
 - 动态获取服务域名；更改默认域名

tigeropen/__init__.py

@@ -4,4 +4,4 @@
 
 @author: gaoan
 """
-__VERSION__ = '2.1.0'
+__VERSION__ = '2.1.1'

tigeropen/trade/domain/order.py

@@ -16,7 +16,7 @@ class Order:
                  "quantity", "filled", "_remaining", "avg_fill_price", "commission", "realized_pnl", "_status",
                  "trail_stop_price", "limit_price", "aux_price", "trailing_percent", "percent_offset", "action",
                  "order_type", "time_in_force", "outside_rth", "order_legs", "algo_params", "algo_strategy",
-                 "secret_key", "liquidation", "discount", "attr_desc", "source", 'adjust_limit', 'sub_ids']
+                 "secret_key", "liquidation", "discount", "attr_desc", "source", 'adjust_limit', 'sub_ids', "user_mark"]
 
     def __init__(self, account, contract, action, order_type, quantity, limit_price=None, aux_price=None,
                  trail_stop_price=None, trailing_percent=None, percent_offset=None, time_in_force=None,
@@ -57,6 +57,7 @@ def __init__(self, account, contract, action, order_type, quantity, limit_price=
         - adjust_limit 价格微调幅度（默认为0表示不调整，正数为向上调整，负数向下调整），对传入价格自动调整到合法价位上.
           例如：0.001 代表向上调整且幅度不超过 0.1%；-0.001 代表向下调整且幅度不超过 0.1%。默认 0 表示不调整
         - sub_ids id list of sub orders.
+        - user_mark: user's remark
         """
 
         self.id = id
@@ -93,6 +94,7 @@ def __init__(self, account, contract, action, order_type, quantity, limit_price=
         self.source = kwargs.get('source')
         self.adjust_limit = kwargs.get('adjust_limit')
         self.sub_ids = kwargs.get('sub_ids')
+        self.user_mark = kwargs.get('user_mark')
 
     def to_dict(self):
         dct = {name: getattr(self, name) for name in self.__slots__ if name not in ORDER_FIELDS_TO_IGNORE}

tigeropen/trade/request/model.py

@@ -737,6 +737,7 @@ def __init__(self):
         self.order_legs = None
         self.algo_params = None
         self.adjust_limit = None
+        self.user_mark = None
 
     def to_openapi_dict(self):
         params = dict()
@@ -792,6 +793,8 @@ def to_openapi_dict(self):
                 params['outside_rth'] = self.outside_rth
             if self.adjust_limit is not None:
                 params['adjust_limit'] = self.adjust_limit
+            if self.user_mark is not None:
+                params['user_mark'] = self.user_mark
 
             if self.order_legs:
                 if len(self.order_legs) > 2:

tigeropen/trade/response/orders_response.py

@@ -21,7 +21,8 @@
                         'timeInForce': 'time_in_force', 'openTime': 'order_time', 'latestTime': 'trade_time',
                         'contractId': 'contract_id', 'algoStrategy': 'algo_strategy',
                         'trailStopPrice': 'trail_stop_price', 'trailingPercent': 'trailing_percent',
-                        'percentOffset': 'percent_offset', 'identifier': 'identifier', 'algoParameters': 'algo_params'
+                        'percentOffset': 'percent_offset', 'identifier': 'identifier', 'algoParameters': 'algo_params',
+                        'userMark': 'user_mark'
                         }
 
 
@@ -101,14 +102,15 @@ def parse_order(item, secret_key=None):
         discount = order_fields.get('discount')
         attr_desc = order_fields.get('attr_desc')
         source = order_fields.get('source')
+        user_mark = order_fields.get('user_mark')
 
         order = Order(account, contract, action, order_type, quantity, limit_price=limit_price, aux_price=aux_price,
                       trail_stop_price=trail_stop_price, trailing_percent=trailing_percent,
                       percent_offset=percent_offset, time_in_force=time_in_force, outside_rth=outside_rth,
                       filled=filled, avg_fill_price=avg_fill_price, commission=commission,
                       realized_pnl=realized_pnl, id=id_, order_id=order_id, parent_id=parent_id,
                       algo_params=algo_params, liquidation=liquidation, algo_strategy=algo_strategy, discount=discount,
-                      attr_desc=attr_desc, source=source)
+                      attr_desc=attr_desc, source=source, user_mark=user_mark)
         if 'order_time' in order_fields:
             order.order_time = order_fields.get('order_time')
         if 'trade_time' in order_fields:

tigeropen/trade/trade_client.py

@@ -533,6 +533,7 @@ def place_order(self, order):
         params.algo_params = order.algo_params
         params.secret_key = order.secret_key if order.secret_key else self._secret_key
         params.adjust_limit = order.adjust_limit
+        params.user_mark = order.user_mark
 
         request = OpenApiRequest(PLACE_ORDER, biz_model=params)
         response_content = self.__fetch_data(request)