Prechádzať zdrojové kódy

MOD:公众号消耗修复第一天充值为0下的bug

cxyu 3 rokov pred
rodič
commit
2a4f9c8bd0
1 zmenil súbory, kde vykonal 62 pridanie a 62 odobranie
  1. 62 62
      data_manage/pitcher_panel.py

+ 62 - 62
data_manage/pitcher_panel.py

@@ -492,68 +492,68 @@ def get_channel_order_trend(user_id,channel,pitcher,start,end,page,page_size,ord
        reg_order_count order_count,
        round(cost/reg_order_user ,2) order_user_per_cost,
        concat(da1,',',da1/cost,',', 0,',',1) d1,
-       concat(da2-da1,',',da2/cost,',', (da2-da1)/cost,',',da2/da1) d2,
-       concat(da3-da2,',',da3/cost,',', (da3-da2)/cost,',',da3/da1) d3,
-       concat(da4-da3,',',da4/cost,',', (da4-da3)/cost,',',da4/da1) d4,
-       concat(da5-da4,',',da5/cost,',', (da5-da4)/cost,',',da5/da1) d5,
-       concat(da6-da5,',',da6/cost,',', (da6-da5)/cost,',',da6/da1) d6,
-       concat(da7-da6,',',da7/cost,',', (da7-da6)/cost,',',da7/da1) d7,
-       concat(da8-da7,',',da8/cost,',', (da8-da7)/cost,',',da8/da1) d8,
-       concat(da9-da8,',',da9/cost,',', (da9-da8)/cost,',',da9/da1) d9,
-concat(da10-da9 ,',' ,da10/cost ,',', (da10-da9)/cost ,',' ,da10/da1) d10,
-concat(da11-da10 ,',' ,da11/cost ,',', (da11-da10)/cost ,',' ,da11/da1) d11,
-concat(da12-da11 ,',' ,da12/cost ,',', (da12-da11)/cost ,',' ,da12/da1) d12,
-concat(da13-da12 ,',' ,da13/cost ,',', (da13-da12)/cost ,',' ,da13/da1) d13,
-concat(da14-da13 ,',' ,da14/cost ,',', (da14-da13)/cost ,',' ,da14/da1) d14,
-concat(da15-da14 ,',' ,da15/cost ,',', (da15-da14)/cost ,',' ,da15/da1) d15,
-concat(da16-da15 ,',' ,da16/cost ,',', (da16-da15)/cost ,',' ,da16/da1) d16,
-concat(da17-da16 ,',' ,da17/cost ,',', (da17-da16)/cost ,',' ,da17/da1) d17,
-concat(da18-da17 ,',' ,da18/cost ,',', (da18-da17)/cost ,',' ,da18/da1) d18,
-concat(da19-da18 ,',' ,da19/cost ,',', (da19-da18)/cost ,',' ,da19/da1) d19,
-concat(da20-da19 ,',' ,da20/cost ,',', (da20-da19)/cost ,',' ,da20/da1) d20,
-concat(da21-da20 ,',' ,da21/cost ,',', (da21-da20)/cost ,',' ,da21/da1) d21,
-concat(da22-da21 ,',' ,da22/cost ,',', (da22-da21)/cost ,',' ,da22/da1) d22,
-concat(da23-da22 ,',' ,da23/cost ,',', (da23-da22)/cost ,',' ,da23/da1) d23,
-concat(da24-da23 ,',' ,da24/cost ,',', (da24-da23)/cost ,',' ,da24/da1) d24,
-concat(da25-da24 ,',' ,da25/cost ,',', (da25-da24)/cost ,',' ,da25/da1) d25,
-concat(da26-da25 ,',' ,da26/cost ,',', (da26-da25)/cost ,',' ,da26/da1) d26,
-concat(da27-da26 ,',' ,da27/cost ,',', (da27-da26)/cost ,',' ,da27/da1) d27,
-concat(da28-da27 ,',' ,da28/cost ,',', (da28-da27)/cost ,',' ,da28/da1) d28,
-concat(da29-da28 ,',' ,da29/cost ,',', (da29-da28)/cost ,',' ,da29/da1) d29,
-concat(da30-da29 ,',' ,da30/cost ,',', (da30-da29)/cost ,',' ,da30/da1) d30,
-concat(da31-da30 ,',' ,da31/cost ,',', (da31-da30)/cost ,',' ,da31/da1) d31,
-concat(da32-da31 ,',' ,da32/cost ,',', (da32-da31)/cost ,',' ,da32/da1) d32,
-concat(da33-da32 ,',' ,da33/cost ,',', (da33-da32)/cost ,',' ,da33/da1) d33,
-concat(da34-da33 ,',' ,da34/cost ,',', (da34-da33)/cost ,',' ,da34/da1) d34,
-concat(da35-da34 ,',' ,da35/cost ,',', (da35-da34)/cost ,',' ,da35/da1) d35,
-concat(da36-da35 ,',' ,da36/cost ,',', (da36-da35)/cost ,',' ,da36/da1) d36,
-concat(da37-da36 ,',' ,da37/cost ,',', (da37-da36)/cost ,',' ,da37/da1) d37,
-concat(da38-da37 ,',' ,da38/cost ,',', (da38-da37)/cost ,',' ,da38/da1) d38,
-concat(da39-da38 ,',' ,da39/cost ,',', (da39-da38)/cost ,',' ,da39/da1) d39,
-concat(da40-da39 ,',' ,da40/cost ,',', (da40-da39)/cost ,',' ,da40/da1) d40,
-concat(da41-da40 ,',' ,da41/cost ,',', (da41-da40)/cost ,',' ,da41/da1) d41,
-concat(da42-da41 ,',' ,da42/cost ,',', (da42-da41)/cost ,',' ,da42/da1) d42,
-concat(da43-da42 ,',' ,da43/cost ,',', (da43-da42)/cost ,',' ,da43/da1) d43,
-concat(da44-da43 ,',' ,da44/cost ,',', (da44-da43)/cost ,',' ,da44/da1) d44,
-concat(da45-da44 ,',' ,da45/cost ,',', (da45-da44)/cost ,',' ,da45/da1) d45,
-concat(da46-da45 ,',' ,da46/cost ,',', (da46-da45)/cost ,',' ,da46/da1) d46,
-concat(da47-da46 ,',' ,da47/cost ,',', (da47-da46)/cost ,',' ,da47/da1) d47,
-concat(da48-da47 ,',' ,da48/cost ,',', (da48-da47)/cost ,',' ,da48/da1) d48,
-concat(da49-da48 ,',' ,da49/cost ,',', (da49-da48)/cost ,',' ,da49/da1) d49,
-concat(da50-da49 ,',' ,da50/cost ,',', (da50-da49)/cost ,',' ,da50/da1) d50,
-concat(da51-da50 ,',' ,da51/cost ,',', (da51-da50)/cost ,',' ,da51/da1) d51,
-concat(da52-da51 ,',' ,da52/cost ,',', (da52-da51)/cost ,',' ,da52/da1) d52,
-concat(da53-da52 ,',' ,da53/cost ,',', (da53-da52)/cost ,',' ,da53/da1) d53,
-concat(da54-da53 ,',' ,da54/cost ,',', (da54-da53)/cost ,',' ,da54/da1) d54,
-concat(da55-da54 ,',' ,da55/cost ,',', (da55-da54)/cost ,',' ,da55/da1) d55,
-concat(da56-da55 ,',' ,da56/cost ,',', (da56-da55)/cost ,',' ,da56/da1) d56,
-concat(da57-da56 ,',' ,da57/cost ,',', (da57-da56)/cost ,',' ,da57/da1) d57,
-concat(da58-da57 ,',' ,da58/cost ,',', (da58-da57)/cost ,',' ,da58/da1) d58,
-concat(da59-da58 ,',' ,da59/cost ,',', (da59-da58)/cost ,',' ,da59/da1) d59,
-concat(da60-da59 ,',' ,da60/cost ,',', (da60-da59)/cost ,',' ,da60/da1) d60,
-concat(dm3-da60 ,',' ,dm3/cost ,',', (dm3-da60)/cost ,',' ,dm3/da1) m3,
-concat(dm4-dm3 ,',' ,dm4/cost ,',', (dm4-dm3)/cost ,',' ,dm4/da1) m4,
-concat(dm5-dm4 ,',' ,dm5/cost ,',', (dm5-dm4)/cost ,',' ,dm5/da1) m5 
+       concat(da2-da1,',',da2/cost,',', (da2-da1)/cost,',',if(da1=0,1,da2/da1) ) d2,
+       concat(da3-da2,',',da3/cost,',', (da3-da2)/cost,',',if(da1=0,1,da3/da1)) d3,
+       concat(da4-da3,',',da4/cost,',', (da4-da3)/cost,',',if(da1=0,1,da4/da1)) d4,
+       concat(da5-da4,',',da5/cost,',', (da5-da4)/cost,',',if(da1=0,1,da5/da1)) d5,
+       concat(da6-da5,',',da6/cost,',', (da6-da5)/cost,',',if(da1=0,1,da6/da1)) d6,
+       concat(da7-da6,',',da7/cost,',', (da7-da6)/cost,',',if(da1=0,1,da7/da1)) d7,
+       concat(da8-da7,',',da8/cost,',', (da8-da7)/cost,',',if(da1=0,1,da8/da1)) d8,
+       concat(da9-da8,',',da9/cost,',', (da9-da8)/cost,',',if(da1=0,1,da9/da1)) d9,
+concat(da10-da9 ,',' ,da10/cost ,',', (da10-da9)/cost ,',' ,if(da1=0,1,da10/da1)) d10,
+concat(da11-da10 ,',' ,da11/cost ,',', (da11-da10)/cost ,',' ,if(da1=0,1,da11/da1)) d11,
+concat(da12-da11 ,',' ,da12/cost ,',', (da12-da11)/cost ,',' ,if(da1=0,1,da12/da1)) d12,
+concat(da13-da12 ,',' ,da13/cost ,',', (da13-da12)/cost ,',' ,if(da1=0,1,da13/da1)) d13,
+concat(da14-da13 ,',' ,da14/cost ,',', (da14-da13)/cost ,',' ,if(da1=0,1,da14/da1)) d14,
+concat(da15-da14 ,',' ,da15/cost ,',', (da15-da14)/cost ,',' ,if(da1=0,1,da15/da1)) d15,
+concat(da16-da15 ,',' ,da16/cost ,',', (da16-da15)/cost ,',' ,if(da1=0,1,da16/da1)) d16,
+concat(da17-da16 ,',' ,da17/cost ,',', (da17-da16)/cost ,',' ,if(da1=0,1,da17/da1)) d17,
+concat(da18-da17 ,',' ,da18/cost ,',', (da18-da17)/cost ,',' ,if(da1=0,1,da18/da1)) d18,
+concat(da19-da18 ,',' ,da19/cost ,',', (da19-da18)/cost ,',' ,if(da1=0,1,da19/da1)) d19,
+concat(da20-da19 ,',' ,da20/cost ,',', (da20-da19)/cost ,',' ,if(da1=0,1,da20/da1)) d20,
+concat(da21-da20 ,',' ,da21/cost ,',', (da21-da20)/cost ,',' ,if(da1=0,1,da21/da1)) d21,
+concat(da22-da21 ,',' ,da22/cost ,',', (da22-da21)/cost ,',' ,if(da1=0,1,da22/da1)) d22,
+concat(da23-da22 ,',' ,da23/cost ,',', (da23-da22)/cost ,',' ,if(da1=0,1,da23/da1)) d23,
+concat(da24-da23 ,',' ,da24/cost ,',', (da24-da23)/cost ,',' ,if(da1=0,1,da24/da1)) d24,
+concat(da25-da24 ,',' ,da25/cost ,',', (da25-da24)/cost ,',' ,if(da1=0,1,da25/da1)) d25,
+concat(da26-da25 ,',' ,da26/cost ,',', (da26-da25)/cost ,',' ,if(da1=0,1,da26/da1)) d26,
+concat(da27-da26 ,',' ,da27/cost ,',', (da27-da26)/cost ,',' ,if(da1=0,1,da27/da1)) d27,
+concat(da28-da27 ,',' ,da28/cost ,',', (da28-da27)/cost ,',' ,if(da1=0,1,da28/da1)) d28,
+concat(da29-da28 ,',' ,da29/cost ,',', (da29-da28)/cost ,',' ,if(da1=0,1,da29/da1)) d29,
+concat(da30-da29 ,',' ,da30/cost ,',', (da30-da29)/cost ,',' ,if(da1=0,1,da30/da1)) d30,
+concat(da31-da30 ,',' ,da31/cost ,',', (da31-da30)/cost ,',' ,if(da1=0,1,da31/da1)) d31,
+concat(da32-da31 ,',' ,da32/cost ,',', (da32-da31)/cost ,',' ,if(da1=0,1,da32/da1)) d32,
+concat(da33-da32 ,',' ,da33/cost ,',', (da33-da32)/cost ,',' ,if(da1=0,1,da33/da1)) d33,
+concat(da34-da33 ,',' ,da34/cost ,',', (da34-da33)/cost ,',' ,if(da1=0,1,da34/da1)) d34,
+concat(da35-da34 ,',' ,da35/cost ,',', (da35-da34)/cost ,',' ,if(da1=0,1,da35/da1)) d35,
+concat(da36-da35 ,',' ,da36/cost ,',', (da36-da35)/cost ,',' ,if(da1=0,1,da36/da1)) d36,
+concat(da37-da36 ,',' ,da37/cost ,',', (da37-da36)/cost ,',' ,if(da1=0,1,da37/da1)) d37,
+concat(da38-da37 ,',' ,da38/cost ,',', (da38-da37)/cost ,',' ,if(da1=0,1,da38/da1)) d38,
+concat(da39-da38 ,',' ,da39/cost ,',', (da39-da38)/cost ,',' ,if(da1=0,1,da39/da1)) d39,
+concat(da40-da39 ,',' ,da40/cost ,',', (da40-da39)/cost ,',' ,if(da1=0,1,da40/da1)) d40,
+concat(da41-da40 ,',' ,da41/cost ,',', (da41-da40)/cost ,',' ,if(da1=0,1,da41/da1)) d41,
+concat(da42-da41 ,',' ,da42/cost ,',', (da42-da41)/cost ,',' ,if(da1=0,1,da42/da1)) d42,
+concat(da43-da42 ,',' ,da43/cost ,',', (da43-da42)/cost ,',' ,if(da1=0,1,da43/da1)) d43,
+concat(da44-da43 ,',' ,da44/cost ,',', (da44-da43)/cost ,',' ,if(da1=0,1,da44/da1)) d44,
+concat(da45-da44 ,',' ,da45/cost ,',', (da45-da44)/cost ,',' ,if(da1=0,1,da45/da1)) d45,
+concat(da46-da45 ,',' ,da46/cost ,',', (da46-da45)/cost ,',' ,if(da1=0,1,da46/da1)) d46,
+concat(da47-da46 ,',' ,da47/cost ,',', (da47-da46)/cost ,',' ,if(da1=0,1,da47/da1)) d47,
+concat(da48-da47 ,',' ,da48/cost ,',', (da48-da47)/cost ,',' ,if(da1=0,1,da48/da1)) d48,
+concat(da49-da48 ,',' ,da49/cost ,',', (da49-da48)/cost ,',' ,if(da1=0,1,da49/da1)) d49,
+concat(da50-da49 ,',' ,da50/cost ,',', (da50-da49)/cost ,',' ,if(da1=0,1,da50/da1)) d50,
+concat(da51-da50 ,',' ,da51/cost ,',', (da51-da50)/cost ,',' ,if(da1=0,1,da51/da1)) d51,
+concat(da52-da51 ,',' ,da52/cost ,',', (da52-da51)/cost ,',' ,if(da1=0,1,da52/da1)) d52,
+concat(da53-da52 ,',' ,da53/cost ,',', (da53-da52)/cost ,',' ,if(da1=0,1,da53/da1)) d53,
+concat(da54-da53 ,',' ,da54/cost ,',', (da54-da53)/cost ,',' ,if(da1=0,1,da54/da1)) d54,
+concat(da55-da54 ,',' ,da55/cost ,',', (da55-da54)/cost ,',' ,if(da1=0,1,da55/da1)) d55,
+concat(da56-da55 ,',' ,da56/cost ,',', (da56-da55)/cost ,',' ,if(da1=0,1,da56/da1)) d56,
+concat(da57-da56 ,',' ,da57/cost ,',', (da57-da56)/cost ,',' ,if(da1=0,1,da57/da1)) d57,
+concat(da58-da57 ,',' ,da58/cost ,',', (da58-da57)/cost ,',' ,if(da1=0,1,da58/da1)) d58,
+concat(da59-da58 ,',' ,da59/cost ,',', (da59-da58)/cost ,',' ,if(da1=0,1,da59/da1)) d59,
+concat(da60-da59 ,',' ,da60/cost ,',', (da60-da59)/cost ,',' ,if(da1=0,1,da60/da1)) d60,
+concat(dm3-da60 ,',' ,dm3/cost ,',', (dm3-da60)/cost ,',' ,if(da1=0,1,dm3/da1)) m3,
+concat(dm4-dm3 ,',' ,dm4/cost ,',', (dm4-dm3)/cost ,',' ,if(da1=0,1,dm4/da1)) m4,
+concat(dm5-dm4 ,',' ,dm5/cost ,',', (dm5-dm4)/cost ,',' ,if(da1=0,1,dm5/da1)) m5
 from ( select * from  dw_channel where cost+reg_order_amount>0  {op} {op1} {op2} {op3} {op4} ) a
 left join  dw_channel_amount_daily b on a.channel=b.channel and a.dt=b.dt 
 left join src_book_info c on a.dt=c.dt and a.book=c.book  and a.type=c.type and a.platform=c.platform