Merge branch 'test' of git.wanmeizhensuo.com:alpha/physical into test

.idea/codeStyles/Project.xml

@@ -24,29 +24,5 @@
         <option name="ITERATION_ELEMENTS_WRAPPING" value="chop_down_if_not_single" />
       </formatting-settings>
     </DBN-SQL>
-    <DBN-PSQL>
-      <case-options enabled="false">
-        <option name="KEYWORD_CASE" value="lower" />
-        <option name="FUNCTION_CASE" value="lower" />
-        <option name="PARAMETER_CASE" value="lower" />
-        <option name="DATATYPE_CASE" value="lower" />
-        <option name="OBJECT_CASE" value="preserve" />
-      </case-options>
-      <formatting-settings enabled="false" />
-    </DBN-PSQL>
-    <DBN-SQL>
-      <case-options enabled="false">
-        <option name="KEYWORD_CASE" value="lower" />
-        <option name="FUNCTION_CASE" value="lower" />
-        <option name="PARAMETER_CASE" value="lower" />
-        <option name="DATATYPE_CASE" value="lower" />
-        <option name="OBJECT_CASE" value="preserve" />
-      </case-options>
-      <formatting-settings enabled="false">
-        <option name="STATEMENT_SPACING" value="one_line" />
-        <option name="CLAUSE_CHOP_DOWN" value="chop_down_if_statement_long" />
-        <option name="ITERATION_ELEMENTS_WRAPPING" value="chop_down_if_not_single" />
-      </formatting-settings>
-    </DBN-SQL>
   </code_scheme>
 </component>
\ No newline at end of file

linucb/views/collect_data.py

@@ -159,7 +159,7 @@ class CollectData(object):
 
                                 click_topic_tag_list = list()
                                 if "on_click_feed_topic_card" == raw_val_dict["type"]:
-                                    topic_id = raw_val_dict["params"]["business_id"] or raw_val_dict["params"]["topic_id"]
+                                    topic_id = raw_val_dict["params"]["topic_id"]
                                     device_id = raw_val_dict["device"]["device_id"]
                                     user_id = raw_val_dict["user_id"] if "user_id" in raw_val_dict else None
 

trans2es/models/topic.py

@@ -323,8 +323,13 @@ class Topic(models.Model):
                     if UserExtra_results.count()>0:
                        if not UserExtra_results[0]['is_shadow']:
                         datetime_list.append(reply['create_time'])
-                dt = max(datetime_list)
-                return datetime.datetime(dt.year,dt.month,dt.day,dt.hour, dt.minute, dt.second,tzinfo=datetime.timezone(datetime.timedelta(hours=8)))
+                if len(datetime_list)>0:
+                   dt = max(datetime_list)
+                   return datetime.datetime(dt.year,dt.month,dt.day,dt.hour, dt.minute, dt.second,tzinfo=datetime.timezone(datetime.timedelta(hours=8)))
+                else:
+                    dt = self.create_time
+                    return datetime.datetime(dt.year, dt.month, dt.day, dt.hour, dt.minute, dt.second,
+                                             tzinfo=datetime.timezone(datetime.timedelta(hours=8)))
             else:
                 dt = self.create_time
                 return datetime.datetime(dt.year,dt.month,dt.day,dt.hour, dt.minute, dt.second,tzinfo=datetime.timezone(datetime.timedelta(hours=8)))