Merge branch 'dev'

handlers/PublicAnalysisHandler.py

@@ -2,6 +2,7 @@ from handlers.HandlerBase import BaseHandler
 from model.log import logger
 from data_manage.public_analysis import *
 import time
+from model.DateUtils import DateUtils
 log = logger()
 
 
@@ -159,13 +160,14 @@ class AdvertisementRank(BaseHandler):
         if not self._au:
             self.write_fial(msg='auth error')
         else:
+            du = DateUtils()
             arg = self.get_args()
-            start = arg.get("start")
+            start = arg.get("start",du.getNow())
             end = arg.get("end")
             ad_id = arg.get("ad_id")
             page = arg.get("page",1)
             page_size = arg.get("page_size")
-            order_by = arg.get("order_by", 'dt')
+            order_by = arg.get("order_by", 'cost')
             order = arg.get("order", 'desc')
             channel = arg.get("channel")
             pitcher = arg.get("pitcher")