From 47a040eb359246af3dff0f003c12381d2e6c88ac Mon Sep 17 00:00:00 2001
From: xjm <xjm@cloudowr.com>
Date: Wed, 20 Mar 2024 14:53:46 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B9=B4=E7=BB=9F=E8=AE=A1=E8=A1=A8=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ssjygl/stat/sale/OrderStatService.java    | 54 ++++++++++++++-----
 1 file changed, 40 insertions(+), 14 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 a624421..0ccfed9 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
@@ -3430,21 +3430,47 @@ public class OrderStatService {
         // 预售
         List<Record> yhList = Db.find(
                 "SELECT\n" +
-                        "	t.supermarket_id id,\n" +
-                        "  ifnull(count(*), 0) as order_num,\n" +
-                        "  ifnull(sum(t.weight), 0) as weight,\n" +
-                        "	ifnull(sum(t.total_price), 0) as total_price\n" +
+                        "       s.id,\n" +
+                        "       ifnull( t.order_num, 0 ) order_num,\n" +
+                        "       ifnull( t.weight, 0 ) weight,\n" +
+                        "       ifnull( t.total_price, 0 ) total_price \n" +
                         "FROM\n" +
-                        "	order_temp t\n" +
-                        "LEFT JOIN ordercluster c ON c.id = t.ordercluster_id\n" +
-                        "LEFT JOIN presell_order p ON p.id = c.presell_order_id\n" +
-                        "WHERE\n" +
-                        "	t.sale_type = 1\n" +
-                        "  AND t.state = 5\n" +
-                        "  AND p.del = 0\n" +
-                        yhParams +
-                        "GROUP BY\n" +
-                        "	t.supermarket_id", yhParamsList.toArray());
+                        "       supermarket s\n" +
+                        "       LEFT JOIN (\n" +
+                        "       SELECT\n" +
+                        "              t.supermarket_id,\n" +
+                        "              ifnull( count(*), 0 ) AS order_num,\n" +
+                        "              ifnull( sum( t.weight ), 0 ) AS weight,\n" +
+                        "              ifnull( sum( t.total_price ), 0 ) AS total_price \n" +
+                        "       FROM\n" +
+                        "              order_temp t\n" +
+                        "              LEFT JOIN ordercluster c ON c.id = t.ordercluster_id\n" +
+                        "              LEFT JOIN presell_order p ON p.id = c.presell_order_id \n" +
+                        "       WHERE\n" +
+                        "              t.sale_type = 1 \n" +
+                        "              AND t.state = 5 \n" +
+                            yhParams +
+                        "       GROUP BY\n" +
+                        "       t.supermarket_id \n" +
+                        "       ) t ON s.id = t.supermarket_id",
+
+//                "SELECT\n" +
+//                        "	t.supermarket_id id,\n" +
+//                        "  ifnull(count(*), 0) as order_num,\n" +
+//                        "  ifnull(sum(t.weight), 0) as weight,\n" +
+//                        "	ifnull(sum(t.total_price), 0) as total_price\n" +
+//                        "FROM\n" +
+//                        "	order_temp t\n" +
+//                        "LEFT JOIN ordercluster c ON c.id = t.ordercluster_id\n" +
+//                        "LEFT JOIN presell_order p ON p.id = c.presell_order_id\n" +
+//                        "WHERE\n" +
+//                        "	t.sale_type = 1\n" +
+//                        "  AND t.state = 5\n" +
+//                        "  AND p.del = 0\n" +
+//                        yhParams +
+//                        "GROUP BY\n" +
+//                        "	t.supermarket_id",
+                yhParamsList.toArray());
 
         List<Record> retChildren = new ArrayList<>();
         List<Record> retList = new ArrayList<>();