|
@@ -247,6 +247,17 @@ from ({sql}) a
|
|
|
li[3] = round(float(li[3]), 2)
|
|
li[3] = round(float(li[3]), 2)
|
|
|
return dict(zip(['amount', 'add', 'roi', 'mult'], li))
|
|
return dict(zip(['amount', 'add', 'roi', 'mult'], li))
|
|
|
|
|
|
|
|
|
|
+ # total已经写错更改过于
|
|
|
|
|
+ def parse_total(key_str):
|
|
|
|
|
+ if type(key_str) is not str:
|
|
|
|
|
+ key_str = key_str.decode('utf-8')
|
|
|
|
|
+ li = key_str.split(',')
|
|
|
|
|
+ li[0] = round(float(li[0]), 2)
|
|
|
|
|
+ li[1] = round(float(li[1]), 4)
|
|
|
|
|
+ li[2] = round(float(li[2]), 4)
|
|
|
|
|
+ li[3] = round(float(li[3]), 2)
|
|
|
|
|
+ return dict(zip(['amount', 'roi', 'add', 'mult'], li))
|
|
|
|
|
+
|
|
|
for k, v in total_data.items():
|
|
for k, v in total_data.items():
|
|
|
if k in ['d1', 'd2', 'd3', 'd4', 'd5', 'd6', 'd7', 'd8', 'd9', 'd10', 'd11', 'd12', 'd13', 'd14', 'd15',
|
|
if k in ['d1', 'd2', 'd3', 'd4', 'd5', 'd6', 'd7', 'd8', 'd9', 'd10', 'd11', 'd12', 'd13', 'd14', 'd15',
|
|
|
'd16', 'd17', 'd18',
|
|
'd16', 'd17', 'd18',
|
|
@@ -255,7 +266,7 @@ from ({sql}) a
|
|
|
'd39', 'd40', 'd41', 'd42', 'd43', 'd44', 'd45', 'd46', 'd47', 'd48', 'd49', 'd50', 'd51', 'd52',
|
|
'd39', 'd40', 'd41', 'd42', 'd43', 'd44', 'd45', 'd46', 'd47', 'd48', 'd49', 'd50', 'd51', 'd52',
|
|
|
'd53', 'd54', 'd55', 'd56', 'd57', 'd58', 'd59',
|
|
'd53', 'd54', 'd55', 'd56', 'd57', 'd58', 'd59',
|
|
|
'd60', 'm3', 'm4', 'm5']:
|
|
'd60', 'm3', 'm4', 'm5']:
|
|
|
- total_data[k] = parse(v) if v else {}
|
|
|
|
|
|
|
+ total_data[k] = parse_total(v) if v else {}
|
|
|
|
|
|
|
|
# print(data)
|
|
# print(data)
|
|
|
for i in data:
|
|
for i in data:
|
|
@@ -546,7 +557,6 @@ def advertisement_rank(user_id, start, end, type, page, page_size, order, order_
|
|
|
op11 = f" and order_count>0" if has_order else ''
|
|
op11 = f" and order_count>0" if has_order else ''
|
|
|
op12 = f" and is_video" if is_video else ''
|
|
op12 = f" and is_video" if is_video else ''
|
|
|
# 公共数据,和素材库一样,个人只显示个人(小组)数据
|
|
# 公共数据,和素材库一样,个人只显示个人(小组)数据
|
|
|
- # TODO:之后op_or1 变化为owner来限制,------dw_image_cost_day 生成时就根据dt,cost来归类owner
|
|
|
|
|
op_or1 = f' or (dt<date_add(now(),interval -5 day) or cost>5000) ' if show_type == 'public' else ''
|
|
op_or1 = f' or (dt<date_add(now(),interval -5 day) or cost>5000) ' if show_type == 'public' else ''
|
|
|
op_order = f" order by {order_by} {order}" if order_by and order else ''
|
|
op_order = f" order by {order_by} {order}" if order_by and order else ''
|
|
|
|
|
|
|
@@ -583,7 +593,7 @@ def advertisement_rank(user_id, start, end, type, page, page_size, order, order_
|
|
|
preview_url
|
|
preview_url
|
|
|
from dw_image_cost_day
|
|
from dw_image_cost_day
|
|
|
where replace (preview_url,' ,','') !=''
|
|
where replace (preview_url,' ,','') !=''
|
|
|
- and (1=1 {op1} {op_or1})
|
|
|
|
|
|
|
+ and (1=1 {op1} {op_or1})
|
|
|
{op4} {op5} {op8} {op10} {op11} {op12}
|
|
{op4} {op5} {op8} {op10} {op11} {op12}
|
|
|
{op_time_bigger} {op_time_small}
|
|
{op_time_bigger} {op_time_small}
|
|
|
{op_order}
|
|
{op_order}
|
