From 4c3952e6a4cf23812090bd9f3ec151971a6c5048 Mon Sep 17 00:00:00 2001
From: wany <13995595726@qq.com>
Date: Tue, 11 Mar 2025 14:46:26 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8F=96=E5=9C=9F=E5=9C=BA=E7=BB=93=E7=AE=97?=
 =?UTF-8?q?=E6=97=B6sale=5Ftype=E4=B8=BA3=EF=BC=9B=E6=8C=89=E5=AE=A2?=
 =?UTF-8?q?=E6=88=B7=E5=B9=B4=E7=BB=9F=E8=AE=A1=E4=B8=8D=E7=BB=9F=E8=AE=A1?=
 =?UTF-8?q?=E5=8E=9F=E6=9D=90=E6=96=99=E8=BF=90=E8=BE=93=E7=9A=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/cowr/ssjygl/stat/sale/OrderStatService.java  | 8 ++++----
 .../ssjygl/order/ordertemp/OrderTempSyncService.java      | 1 +
 2 files changed, 5 insertions(+), 4 deletions(-)

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 ab952d9..d2e0ccc 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
@@ -2051,7 +2051,7 @@ public class OrderStatService {
                         "    LEFT JOIN product p ON p.id = t.product_id " +
                         "    left join customer c on c.id = t.customer_id\n" +
 //                        "    where t.state = 5\n" +
-                        "    where 1 = 1\n" +
+                        "    where 1 = 1 and t.sale_type != 3 \n" +
                         saleParams +
 //                        "    and t.create_time like ? \n";
 //                        "    and t.create_time between ? and ? \n";
@@ -2088,7 +2088,7 @@ public class OrderStatService {
                         "    from order_end t\n" +
                         "    left join customer c on c.id = t.customer_id\n" +
 //                        "    where t.state = 5\n" +
-                        "    where 1 = 1\n" +
+                        "    where 1 = 1 and t.sale_type != 3 \n" +
                         saleParams +
 //                        "    and t.create_time like ? \n";
 //                        "    and t.create_time between ? and ? \n";
@@ -2129,7 +2129,7 @@ public class OrderStatService {
                         "    LEFT JOIN product p ON p.id = t.product_id " +
                         "    left join customer c on c.id = t.customer_id\n" +
 //                        "    where t.state = 5\n" +
-                        "    where 1 = 1\n" + saleParams;
+                        "    where 1 = 1 and t.sale_type != 3 \n" + saleParams;
 
                 if (customer_id != null) {
                     sql += " and c.id = ? \n";
@@ -2160,7 +2160,7 @@ public class OrderStatService {
                         "    from order_end t\n" +
                         "    left join customer c on c.id = t.customer_id\n" +
 //                        "    where t.state = 5\n" +
-                        "    where 1 = 1\n" + saleParams;
+                        "    where 1 = 1 and t.sale_type != 3 \n" + saleParams;
 
                 if (customer_id != null) {
                     sql += " and c.id = ? \n";
diff --git a/ssjygl-xsct-local/src/main/java/com/cowr/local/ssjygl/order/ordertemp/OrderTempSyncService.java b/ssjygl-xsct-local/src/main/java/com/cowr/local/ssjygl/order/ordertemp/OrderTempSyncService.java
index de673b9..236af9d 100644
--- a/ssjygl-xsct-local/src/main/java/com/cowr/local/ssjygl/order/ordertemp/OrderTempSyncService.java
+++ b/ssjygl-xsct-local/src/main/java/com/cowr/local/ssjygl/order/ordertemp/OrderTempSyncService.java
@@ -493,6 +493,7 @@ public class OrderTempSyncService {
         order.setSettlementUserId(sysuser.getId());
         order.setSettlementUserName(sysuser.getName());
 
+        order.setSaleType(ordercluster.getSaleType());
         order.setState(OrderStateEnum.RECEIVED.getStateid()); // 直接完成，没有前面的过程
         order.setCreateTime(now);
         order.setMemo(memo); // 备注