|
|
@@ -4,6 +4,8 @@ from model.DataBaseUtils import *
|
|
|
from model.CommonUtils import *
|
|
|
from model import UserAuthUtils
|
|
|
from model.UserAuthUtils import super_auth
|
|
|
+from model.DateUtils import DateUtils
|
|
|
+from datetime import datetime,timedelta
|
|
|
|
|
|
|
|
|
class OrderInfoGame(BaseHandler):
|
|
|
@@ -74,10 +76,23 @@ class OrderInfo(BaseHandler):
|
|
|
# role 表
|
|
|
role_name = args.get("role_name")
|
|
|
start = args.get("start", self.thisday)
|
|
|
- end = args.get("end")
|
|
|
+
|
|
|
+ if args.get("end"):
|
|
|
+ tmp_end =args.get("end")
|
|
|
+ tmp_end = datetime.strptime(tmp_end,'%Y-%m-%d')
|
|
|
+ tmp_end = tmp_end + timedelta(days=1)
|
|
|
+ end = tmp_end.strftime('%Y-%m-%d')
|
|
|
+ else:
|
|
|
+ end=None
|
|
|
|
|
|
user_start = args.get("user_start")
|
|
|
- user_end = args.get("user_end")
|
|
|
+ if args.get("user_end"):
|
|
|
+ tmp_end =args.get("user_end")
|
|
|
+ tmp_end = datetime.strptime(tmp_end,'%Y-%m-%d')
|
|
|
+ tmp_end = tmp_end + timedelta(days=1)
|
|
|
+ user_end = tmp_end.strftime('%Y-%m-%d')
|
|
|
+ else:
|
|
|
+ user_end=None
|
|
|
|
|
|
order_id = args.get('order_id')
|
|
|
member_id = args.get('member_id')
|
|
|
@@ -105,6 +120,7 @@ class OrderInfo(BaseHandler):
|
|
|
game, agent_name,
|
|
|
page, page_size, order_, order_by):
|
|
|
db = MysqlUtils()
|
|
|
+
|
|
|
if user_id in super_auth():
|
|
|
op = ''
|
|
|
op_sup1 = ''
|
|
|
@@ -171,7 +187,10 @@ class OrderInfo(BaseHandler):
|
|
|
left join db_mp.mp_mp_conf c on b.advertiser_conf_id = c.id
|
|
|
left join db_mp.h_member d on a.mem_id = d.id
|
|
|
left join db_mp.h_game e on a.app_id =e.id
|
|
|
- left join db_mp.h_mg_role g on g.mg_mem_id = a.mg_mem_id
|
|
|
+ left join db_mp.h_pay_ext f on a.id = f.pay_id
|
|
|
+ left join db_mp.h_mg_role g
|
|
|
+ on g.role_id = f.role_id and g.server_id = f.server_id
|
|
|
+ and g.app_id = a.app_id and g.mg_mem_id =a.mg_mem_id
|
|
|
left join quchen_text.advertiser_vx h on c.wx_name =h.name
|
|
|
left join db_mp.h_user q on a.agent_id =q.id
|
|
|
left join quchen_text.advertiser_vx i on c.wx_name =i.name
|
