From 6205136df2e08ad386bfae50da42f6b96fd003b3 Mon Sep 17 00:00:00 2001
From: wuwenxiong <646448316@qq.com>
Date: Thu, 21 Oct 2021 10:49:02 +0800
Subject: [PATCH] =?UTF-8?q?=E7=B4=AF=E8=AE=A1=E9=94=80=E5=94=AE=E6=B1=87?=
 =?UTF-8?q?=E6=80=BB=E7=9F=AD=E4=BF=A1=E5=AE=9A=E6=97=B6=E4=BB=BB=E5=8A=A1?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9-5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/cowr/ssjygl/stat/sale/OrderStatService.java   | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

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 1a619da..5d3912d 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
@@ -2171,8 +2171,8 @@ public class OrderStatService {
                 "         ifnull(sum(t.total_price), 0) total_price\n" +
                 "     from order_temp t\n" +
                 "     where t.state = 5\n" +
-                "     and t.supermarket_id = 4" +
-                "     and (t.create_time < '2021-09-08 00:00:00' \n" +
+                "     and t.supermarket_id = 4\n" +
+                "     and (t.create_time < '2021-09-08 00:00:00'\n" +
                 "     or t.create_time > '2021-10-15 23:59:59')\n" +
                 "     and t.create_time >= ? \n" +
                 "     and t.create_time <= ?\n" +
@@ -2187,12 +2187,11 @@ public class OrderStatService {
                 "         ifnull(sum(t.total_price), 0) total_price\n" +
                 "     from order_temp t\n" +
                 "     where t.state = 5\n" +
-                "     and t.supermarket_id = 4" +
-                "     and t.create_time >= '2021-09-08 00:00:00' \n" +
-                "     and t.create_time <= '2021-10-15 23:59:59'\n" +
+                "     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" +
                 "     and t.create_time >= ? \n" +
                 "     and t.create_time <= ?\n" +
-                "     or (t.create_time >= '2021-10-20 00:00:00' and t.create_time <= '2021-10-20 23:59:59')\n" +
                 paramsSql +
                 "     group by t.customer_id\n";