运输日志修改
parent
e61a2c3adb
commit
31c92614f7
|
|
@ -140,7 +140,7 @@ public class OrderTempService extends BaseService {
|
|||
}
|
||||
|
||||
if (supermarket_id != null) {
|
||||
fromsql += " and s.supermarket_id = ? \n";
|
||||
fromsql += " and s.id = ? \n";
|
||||
paraList.add(supermarket_id);
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -2547,6 +2547,7 @@ public class OrderStatService {
|
|||
" from order_temp t\n" +
|
||||
" left join customer c on c.id = t.customer_id \n" +
|
||||
" where t.state = 5\n" +
|
||||
" and t.sale_type != 2\n" +
|
||||
saleParam +
|
||||
" and t.create_time >= ? \n" +
|
||||
" and t.create_time <= ? \n" +
|
||||
|
|
@ -2575,6 +2576,7 @@ public class OrderStatService {
|
|||
" from order_temp t\n" +
|
||||
" left join customer c on c.id = t.customer_id \n" +
|
||||
" where t.state = 5\n" +
|
||||
" and t.sale_type != 2\n" +
|
||||
saleParam +
|
||||
" and t.create_time >= ? \n" +
|
||||
" and t.create_time <= ? \n";
|
||||
|
|
|
|||
Loading…
Reference in New Issue