From f228ed7303298d12b1bb3ade03d13115e008d400 Mon Sep 17 00:00:00 2001 From: xjm Date: Mon, 29 Jan 2024 10:05:15 +0800 Subject: [PATCH] =?UTF-8?q?=E9=A6=96=E9=A1=B5=E7=BB=9F=E8=AE=A1=E6=8E=92?= =?UTF-8?q?=E9=99=A4=E9=A2=84=E5=94=AE=E8=AE=A2=E5=8D=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/cowr/ssjygl/overall/OverallService.java | 3 +++ .../java/com/cowr/ssjygl/stat/sale/OrderStatService.java | 8 ++++++++ 2 files changed, 11 insertions(+) diff --git a/ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/overall/OverallService.java b/ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/overall/OverallService.java index c51a895..0a0a3f0 100644 --- a/ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/overall/OverallService.java +++ b/ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/overall/OverallService.java @@ -193,6 +193,8 @@ group by date " ifnull(sum(case when t.date >= ? 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" + " from order_end t\n" + + " WHERE t.sale_type = 0 \n" + + " UNION\n" + " SELECT\n" + " ifnull( sum( t.weight ), 0 ) total_weight,\n" + @@ -212,6 +214,7 @@ group by date " WHERE\n" + " t.state = 5 \n" + " AND t.create_time >= ? " + + " and t.sale_type = 0 \n" + " union\n" + " select \n" + " 0 total_weight,\n" + diff --git a/ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/stat/sale/OrderStatService.java b/ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/stat/sale/OrderStatService.java index 2b8e096..c0e7c41 100644 --- a/ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/stat/sale/OrderStatService.java +++ b/ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/stat/sale/OrderStatService.java @@ -2298,6 +2298,8 @@ public class OrderStatService { if (sale_type != null && (sale_type == 0 || sale_type == 1)) { union_4 += " and t.sale_type = " + sale_type + " \n"; + }else{ + union_4 += " and t.sale_type = 0 \n"; } union_4 += " and t.supermarket_id = 4\n" + @@ -2323,7 +2325,10 @@ public class OrderStatService { if (sale_type != null && (sale_type == 0 || sale_type == 1)) { union_99 += " and t.sale_type = " + sale_type + " \n"; + }else{ + union_99 += " and t.sale_type = 0 \n"; } + union_99 += " and t.supermarket_id = 4\n" + " and ((t.create_time >= '2021-09-08 00:00:00' and t.create_time <= '2021-10-15 23:59:59') \n" + " or (t.create_time >= '2021-10-20 00:00:00' and t.create_time <= '2021-10-20 23:59:59'))\n" + @@ -2346,7 +2351,10 @@ public class OrderStatService { if (sale_type != null && (sale_type == 0 || sale_type == 1)) { today += " and t.sale_type = " + sale_type + " \n"; + }else{ + today += " and t.sale_type = 0 \n"; } + today += " and t.supermarket_id != 4\n" + " AND t.create_time >= CONCAT( CURDATE(), ' 00:00:00' ) \n" + // " and t.create_time>= ? \n" +