|
|
@@ -750,14 +750,23 @@ def get_channel_order_trend(user_id,channel,pitcher,start,end,page,page_size,ord
|
|
|
data,total,total_data=getLimitSumData(db.dm,sql,sumsql,page,page_size)
|
|
|
|
|
|
|
|
|
- def parse(str):
|
|
|
- li=str.split(',')
|
|
|
+ def parse(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(['order','roi','add','mult'],li))
|
|
|
|
|
|
+ for x in total_data.keys():
|
|
|
+ if x in ['d1','d2','d3','d4','d5','d6','d7','d8','d9','d10','d11','d12','d13','d14','d15','d16','d17','d18',
|
|
|
+ 'd19','d20','d21','d22','d23','d24','d25','d26','d27','d28','d29','d30','d31','d32','d33','d34','d35','d36','d37','d38',
|
|
|
+ 'd39','d40','d41','d42','d43','d44','d45','d46','d47','d48','d49','d50','d51','d52','d53','d54','d55','d56','d57','d58','d59',
|
|
|
+ 'd60','m3','m4','m5']:
|
|
|
+ total_data[x]=parse(total_data[x]) if total_data[x] is not None else {}
|
|
|
+
|
|
|
for i in data:
|
|
|
for x in i:
|
|
|
if x in ['d1','d2','d3','d4','d5','d6','d7','d8','d9','d10','d11','d12','d13','d14','d15','d16','d17','d18',
|
|
|
@@ -765,7 +774,7 @@ def get_channel_order_trend(user_id,channel,pitcher,start,end,page,page_size,ord
|
|
|
'd39','d40','d41','d42','d43','d44','d45','d46','d47','d48','d49','d50','d51','d52','d53','d54','d55','d56','d57','d58','d59',
|
|
|
'd60','m3','m4','m5']:
|
|
|
i[x]=parse(i[x]) if i[x] is not None else {}
|
|
|
- print(data)
|
|
|
+
|
|
|
return data,total,total_data
|
|
|
|
|
|
def get_channel_summary(user_id,channel,pitcher,page,page_size,order_by,order,state,location,start,end):
|
