Merge branch 'master' into feature/automatic

pojo/ReserveResultPojo.py

@@ -30,6 +30,7 @@ class ReserveResultPojo:
     sim_position = None
     ccid: str = ""
     source_from: str = definitions.LOG_SOURCE
+    store_type = 0
 
     @staticmethod
     def from_firestore_dict(source):
@@ -62,6 +63,9 @@ class ReserveResultPojo:
         if 'ccid' in source:
             ccid = source['ccid']
             result.ccid = ccid
+        if 'store_type' in source:
+            store_type = source['store_type']
+            result.store_type = store_type
         result.id = id
         return result
 
@@ -79,7 +83,8 @@ class ReserveResultPojo:
             u'sim_position': self.sim_position,
             u'slot_position': self.slot_position,
             u'ccid': self.ccid,
-            u'source_from': self.source_from
+            u'source_from': self.source_from,
+            u'store_type': self.store_type,
         }
 
         return dest

workers/commandor_page.py

@@ -53,7 +53,7 @@ class CommandorPage:
 
     def __init__(self, contact: ContactPojo, store_type=0, proxy_type=0, mode: ModeEnum = ModeEnum.MANUAL):
         self.otp_value = None
-        self.logger = logging.getLogger("CommandorPage:" + str(contact.phone))
+        self.logger = logging.getLogger("约会页面:" + str(contact.phone))
         self.is_finished = False
         self.contact = contact
         self.proxy_type = proxy_type
@@ -328,6 +328,7 @@ class CommandorPage:
                                    firstName=contact.first_name, lastName=contact.last_name, email=contact.mail,
                                    passport=contact.passport, ccid=contact.ccid)
         result.id = id
+        result.store_type = self.store_type
         params.firebase_store_manager.save(result)
         if status is PublishType.SUCCESS:
             self.on_success(result)