|
@@ -440,10 +440,10 @@
|
|
|
end
|
|
|
) as price,
|
|
|
round(sum(t1.total_fee) / 100, 2) as 'totalFee',
|
|
|
- IFNULL(round(SUM(CASE WHEN t1.status != 80 THEN t1.total_fee ELSE 0 END) / 100, 2), 0) as 'validTotalFee',
|
|
|
+ IFNULL(round(SUM(CASE WHEN t1.status != 80 and t1.status != 10 THEN t1.total_fee ELSE 0 END) / 100, 2), 0) as 'validTotalFee',
|
|
|
count(t1.oid) as 'orderNum',
|
|
|
- IFNULL(SUM(CASE WHEN t1.status != 80 THEN 1 ELSE 0 END), 0) AS 'validOrderNum',
|
|
|
- round(sum(case when t1.status != 80 then 1 else 0 end) / count(t1.oid) * 100,
|
|
|
+ IFNULL(SUM(CASE WHEN t1.status != 80 and t1.status != 10 THEN 1 ELSE 0 END), 0) AS 'validOrderNum',
|
|
|
+ round(sum(case when t1.status != 80 and t1.status != 10 then 1 else 0 end) / count(t1.oid) * 100,
|
|
|
2) as 'validRadio',
|
|
|
sum(case when t1.status >= 40 and t1.status < 80 then 1 else 0 end) as 'deliveryNum',
|
|
|
round(sum(case when t1.status >= 40 and t1.status < 80 then 1 else 0 end) /
|