首页统计修改
parent
bdb26c4104
commit
ccc9d87f76
|
|
@ -272,6 +272,7 @@ group by date
|
||||||
" ifnull(sum(case when t.date >= ? and t.sale_type = 0 then t.total_price end ), 0) day_total_price,\n" +
|
" ifnull(sum(case when t.date >= ? and t.sale_type = 0 then t.total_price end ), 0) day_total_price,\n" +
|
||||||
" ifnull(sum(case when t.date >= ? then t.count else 0 end ), 0) day_truck_cnt\n" +
|
" ifnull(sum(case when t.date >= ? then t.count else 0 end ), 0) day_truck_cnt\n" +
|
||||||
" from order_end t\n" +
|
" from order_end t\n" +
|
||||||
|
" where t.sale_type != 2\n" +
|
||||||
" UNION\n" +
|
" UNION\n" +
|
||||||
" select \n" +
|
" select \n" +
|
||||||
" 0 total_weight,\n" +
|
" 0 total_weight,\n" +
|
||||||
|
|
@ -359,6 +360,7 @@ group by date
|
||||||
" from order_temp t\n" +
|
" from order_temp t\n" +
|
||||||
" where t.state = ?\n" +
|
" where t.state = ?\n" +
|
||||||
" and t.create_time > ?\n" +
|
" and t.create_time > ?\n" +
|
||||||
|
" and t.sale_type != 2 \n" +
|
||||||
" group by date",
|
" group by date",
|
||||||
OrderStateEnum.RECEIVED.getStateid(),
|
OrderStateEnum.RECEIVED.getStateid(),
|
||||||
tm);
|
tm);
|
||||||
|
|
|
||||||
|
|
@ -1267,6 +1267,7 @@ public class OrderStatService {
|
||||||
saleParam +
|
saleParam +
|
||||||
" and t.create_time >= ? \n" +
|
" and t.create_time >= ? \n" +
|
||||||
" and t.create_time <= ? \n" +
|
" and t.create_time <= ? \n" +
|
||||||
|
" and t.sale_type != 2 \n" +
|
||||||
productParams +
|
productParams +
|
||||||
") t\n" +
|
") t\n" +
|
||||||
"group by date_format(t.create_time, '%Y-%m-%d') ,t.product_id,t.product_name\n" +
|
"group by date_format(t.create_time, '%Y-%m-%d') ,t.product_id,t.product_name\n" +
|
||||||
|
|
@ -1280,6 +1281,7 @@ public class OrderStatService {
|
||||||
saleParam +
|
saleParam +
|
||||||
" and t.create_time >= ? \n" +
|
" and t.create_time >= ? \n" +
|
||||||
" and t.create_time <= ? \n" +
|
" and t.create_time <= ? \n" +
|
||||||
|
" and t.sale_type != 2 \n" +
|
||||||
productParams +
|
productParams +
|
||||||
") t\n" +
|
") t\n" +
|
||||||
"group by date_format(t.create_time, '%Y-%m-%d')\n" +
|
"group by date_format(t.create_time, '%Y-%m-%d')\n" +
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue