From c42ee62ec8f760ba4d8e773dd8cf091c61db4745 Mon Sep 17 00:00:00 2001
From: xjm <xjm@cloudowr.com>
Date: Tue, 5 Sep 2023 17:30:49 +0800
Subject: [PATCH] =?UTF-8?q?=E9=A6=96=E9=A1=B5=E7=BB=9F=E8=AE=A1=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9=20=E6=8E=92=E9=99=A4=20=E5=A4=84=E7=BD=AE=E7=A0=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/com/cowr/ssjygl/overall/OverallService.java    | 2 ++
 .../java/com/cowr/ssjygl/stat/sale/OrderStatService.java     | 5 +++++
 2 files changed, 7 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 e7fb764..a4c8e5c 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
@@ -175,6 +175,7 @@ group by date
                "              from order_temp t\n" +
                "			     where t.sale_type = 0\n" +
                "			     and t.state = 5\n" +
+               "                 and t.product_id != 4\n" +
                "			   union\n" +
                "           select \n" +
                "               0 total_weight,\n" +
@@ -445,6 +446,7 @@ group by date
         List<Record> data2 = Db.find("select case when t.customer_id is null then 2 else 1 end cid, count(t.sn) day_cnt, sum(t.weight) day_weight, sum(total_price) day_total_price \n" +
                 " from order_temp t\n" +
                 " where t.state = 5\n" +
+                " and t.product_id != 4\n" +
                 " and t.create_time like ?\n" +
                 " group by cid", nowdaytm + "%");
 
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 2b68596..412b344 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
@@ -2243,6 +2243,7 @@ public class OrderStatService {
                 "         ifnull(sum(t.total_price), 0) total_price\n" +
                 "     from order_temp t\n" +
                 "     where t.state = 5\n" +
+                "     and t.product_id != 4\n" +
                 saleParam +
                 "     and t.supermarket_id = 4\n" +
                 "     and (t.create_time < '2021-09-08 00:00:00'\n" +
@@ -2260,6 +2261,7 @@ public class OrderStatService {
                 "         ifnull(sum(t.total_price), 0) total_price\n" +
                 "     from order_temp t\n" +
                 "     where t.state = 5\n" +
+                "     and t.product_id != 4\n" +
                 saleParam +
                 "     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" +
@@ -2297,6 +2299,7 @@ public class OrderStatService {
                 "         ifnull(sum(t.total_price), 0) total_price\n" +
                 "     from order_temp t\n" +
                 "     where t.state = 5\n" +
+                "     and t.product_id != 4\n" +
                 saleParam +
                 "     and t.supermarket_id != 4\n" +
                 "     and t.create_time>= ? \n" +
@@ -2354,6 +2357,7 @@ public class OrderStatService {
                 "                       select t.customer_id, sum(t.total_price) total_price\n" +
                 "                     from order_temp t\n" +
                 "                     where t.customer_id is not null\n" +
+                "                       and t.product_id != 4\n" +
                 "                       and t.create_time <= ?\n" +
                 "                       and t.state = 5\n" +
                 "                       and t.sale_type = 0\n" +
@@ -2660,6 +2664,7 @@ public class OrderStatService {
                 "        ifnull(sum(t.total_price), 0) total_price\n" +
                 "    from order_temp t\n" +
                 "    where t.state = 5\n" +
+                "    and t.product_id != 4\n" +
                 "    and t.create_time >= ?\n" +
                 "    and t.create_time <= ?\n" +
                 paramsSql +