bug修改
parent
4c3952e6a4
commit
f77b4d3b05
|
|
@ -2051,7 +2051,7 @@ public class OrderStatService {
|
||||||
" LEFT JOIN product p ON p.id = t.product_id " +
|
" LEFT JOIN product p ON p.id = t.product_id " +
|
||||||
" left join customer c on c.id = t.customer_id\n" +
|
" left join customer c on c.id = t.customer_id\n" +
|
||||||
// " where t.state = 5\n" +
|
// " where t.state = 5\n" +
|
||||||
" where 1 = 1 and t.sale_type != 3 \n" +
|
" where 1 = 1 and t.sale_type != 2 \n" +
|
||||||
saleParams +
|
saleParams +
|
||||||
// " and t.create_time like ? \n";
|
// " and t.create_time like ? \n";
|
||||||
// " and t.create_time between ? and ? \n";
|
// " and t.create_time between ? and ? \n";
|
||||||
|
|
@ -2088,7 +2088,7 @@ public class OrderStatService {
|
||||||
" from order_end t\n" +
|
" from order_end t\n" +
|
||||||
" left join customer c on c.id = t.customer_id\n" +
|
" left join customer c on c.id = t.customer_id\n" +
|
||||||
// " where t.state = 5\n" +
|
// " where t.state = 5\n" +
|
||||||
" where 1 = 1 and t.sale_type != 3 \n" +
|
" where 1 = 1 and t.sale_type != 2 \n" +
|
||||||
saleParams +
|
saleParams +
|
||||||
// " and t.create_time like ? \n";
|
// " and t.create_time like ? \n";
|
||||||
// " and t.create_time between ? and ? \n";
|
// " and t.create_time between ? and ? \n";
|
||||||
|
|
@ -2129,7 +2129,7 @@ public class OrderStatService {
|
||||||
" LEFT JOIN product p ON p.id = t.product_id " +
|
" LEFT JOIN product p ON p.id = t.product_id " +
|
||||||
" left join customer c on c.id = t.customer_id\n" +
|
" left join customer c on c.id = t.customer_id\n" +
|
||||||
// " where t.state = 5\n" +
|
// " where t.state = 5\n" +
|
||||||
" where 1 = 1 and t.sale_type != 3 \n" + saleParams;
|
" where 1 = 1 and t.sale_type != 2 \n" + saleParams;
|
||||||
|
|
||||||
if (customer_id != null) {
|
if (customer_id != null) {
|
||||||
sql += " and c.id = ? \n";
|
sql += " and c.id = ? \n";
|
||||||
|
|
@ -2160,7 +2160,7 @@ public class OrderStatService {
|
||||||
" from order_end t\n" +
|
" from order_end t\n" +
|
||||||
" left join customer c on c.id = t.customer_id\n" +
|
" left join customer c on c.id = t.customer_id\n" +
|
||||||
// " where t.state = 5\n" +
|
// " where t.state = 5\n" +
|
||||||
" where 1 = 1 and t.sale_type != 3 \n" + saleParams;
|
" where 1 = 1 and t.sale_type != 2 \n" + saleParams;
|
||||||
|
|
||||||
if (customer_id != null) {
|
if (customer_id != null) {
|
||||||
sql += " and c.id = ? \n";
|
sql += " and c.id = ? \n";
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue