merge from master

rqalpha/model/order.py

@@ -31,6 +31,7 @@ class Order(object):
 
     def __init__(self):
         self._order_id = None
+        self._secondary_order_id = None
         self._calendar_dt = None
         self._trading_dt = None
         self._quantity = None
@@ -56,6 +57,7 @@ def _str_to_enum(enum_class, s):
     def get_state(self):
         return {
             'order_id': self._order_id,
+            'secondary_order_id': self._secondary_order_id,
             'calendar_dt': self._calendar_dt,
             'trading_dt': self._trading_dt,
             'order_book_id': self._order_book_id,
@@ -73,6 +75,8 @@ def get_state(self):
 
     def set_state(self, d):
         self._order_id = d['order_id']
+        if 'secondary_order_id' in d:
+            self._secondary_order_id = d['secondary_order_id']
         self._calendar_dt = d['calendar_dt']
         self._trading_dt = d['trading_dt']
         self._order_book_id = d['order_book_id']
@@ -121,6 +125,13 @@ def order_id(self):
         """
         return self._order_id
 
+    @property
+    def secondary_order_id(self):
+        """
+        [str] 实盘交易中交易所产生的订单ID
+        """
+        return self._secondary_order_id
+
     @property
     def trading_datetime(self):
         """
@@ -269,6 +280,9 @@ def mark_cancelled(self, cancelled_reason, user_warn=True):
     def set_frozen_price(self, value):
         self._frozen_price = value
 
+    def set_secondary_order_id(self, secondary_order_id):
+        self._secondary_order_id = str(secondary_order_id)
+
     def __simple_object__(self):
         return properties(self)