From ccc9d87f767ff2837b8b7f91ae835e98ca78109b Mon Sep 17 00:00:00 2001
From: wany <13995595726@qq.com>
Date: Fri, 14 Mar 2025 16:51:02 +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?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/java/com/cowr/ssjygl/overall/OverallService.java   | 2 ++
 .../main/java/com/cowr/ssjygl/stat/sale/OrderStatService.java   | 2 ++
 2 files changed, 4 insertions(+)

diff --git a/ssjygl-xsct-common/src/main/java/com/cowr/ssjygl/overall/OverallService.java b/ssjygl-xsct-common/src/main/java/com/cowr/ssjygl/overall/OverallService.java
index b457378..0118c8e 100644
--- a/ssjygl-xsct-common/src/main/java/com/cowr/ssjygl/overall/OverallService.java
+++ b/ssjygl-xsct-common/src/main/java/com/cowr/ssjygl/overall/OverallService.java
@@ -272,6 +272,7 @@ group by date
                "               ifnull(sum(case when t.date >= ? and t.sale_type = 0  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 != 2\n" +
                "              UNION\n" +
                "           select \n" +
                "               0 total_weight,\n" +
@@ -359,6 +360,7 @@ group by date
                         " from order_temp t\n" +
                         " where t.state = ?\n" +
                         " and t.create_time > ?\n" +
+                        " and t.sale_type != 2 \n" +
                         " group by date",
                 OrderStateEnum.RECEIVED.getStateid(),
                 tm);
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 7b9e73a..1580d43 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
@@ -1267,6 +1267,7 @@ public class OrderStatService {
                     saleParam +
                     "    and t.create_time >= ? \n" +
                     "    and t.create_time <= ? \n" +
+                    "    and t.sale_type != 2 \n" +
                     productParams +
                     ") t\n" +
                     "group by date_format(t.create_time, '%Y-%m-%d') ,t.product_id,t.product_name\n" +
@@ -1280,6 +1281,7 @@ public class OrderStatService {
                     saleParam +
                     "    and t.create_time >= ? \n" +
                     "    and t.create_time <= ? \n" +
+                    "    and t.sale_type != 2 \n" +
                     productParams +
                     ") t\n" +
                     "group by date_format(t.create_time, '%Y-%m-%d')\n" +