Merge branch 'dev'

data_manage/pitcher_panel.py

@@ -225,7 +225,13 @@ def get_channel_again_order_trend(channel,date):
     # print(data)
     key1=['date','channel','book','pitcher','stage','cost','reg_amount','roi','new_follow','new_follow_per_cost',
          'reg_count','reg_user','cost_per_user','avg_order_amount','avg_again_order_rate','order_count']
-    json1=get_dict_list(key1,get_round(data))[0]
+
+    j=get_dict_list(key1,get_round(data))
+    if len(j) == 0:
+        return None
+    else:
+        json1 = j[0]
+
     # print(json1)
     # print(json1)
     sql2=f"""select

handlers/PitcherPanelHandler.py

@@ -133,7 +133,7 @@ class ChannelOrderTrend(BaseHandler):
             user_id =arg.get('user_id')
             pitcher=arg.get("pitcher")
             channel = arg.get("channel")
-            start = arg.get("start",self.thisday)
+            start = arg.get("start",self.get_n_days(-30)) if channel else arg.get("start",self.thisday)
             end = arg.get("end")
             page = arg.get("page", 1)
             page_size = arg.get("page_size", 10)