diff --git a/ssjygl-xsct-common/src/main/java/com/cowr/ssjygl/order/ordertemp/OrderTempService.java b/ssjygl-xsct-common/src/main/java/com/cowr/ssjygl/order/ordertemp/OrderTempService.java index 00fa8b1..127f82b 100644 --- a/ssjygl-xsct-common/src/main/java/com/cowr/ssjygl/order/ordertemp/OrderTempService.java +++ b/ssjygl-xsct-common/src/main/java/com/cowr/ssjygl/order/ordertemp/OrderTempService.java @@ -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); } diff --git a/ssjygl-xsct-common/src/main/java/com/cowr/ssjygl/stat/sale/OrderStatService.java b/ssjygl-xsct-common/src/main/java/com/cowr/ssjygl/stat/sale/OrderStatService.java index b673a46..f5c255a 100644 --- a/ssjygl-xsct-common/src/main/java/com/cowr/ssjygl/stat/sale/OrderStatService.java +++ b/ssjygl-xsct-common/src/main/java/com/cowr/ssjygl/stat/sale/OrderStatService.java @@ -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";