From 50f196d49cea61c2a3029d2f31149a06580be1d4 Mon Sep 17 00:00:00 2001
From: xiaocui <1334950895@qq.com>
Date: Tue, 30 Mar 2021 21:52:40 +0800
Subject: [PATCH] =?UTF-8?q?=E7=A0=82=E7=AB=99=E8=BF=90=E8=BE=93=E9=87=8F?=
 =?UTF-8?q?=E7=BB=9F=E8=AE=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../cowr/ssjygl/stat/sale/OrderStatService.java  | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 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 34d123d..1576ba6 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
@@ -1991,7 +1991,7 @@ public class OrderStatService {
                 "FROM\n" +
                 "(\n" +
                 "SELECT\n" +
-                "t.customer_id,\n" +
+                "t.sn,t.customer_id,\n" +
                 "t.customer_name,\n" +
                 "t.weight,\n" +
                 "t.total_price,\n" +
@@ -2005,7 +2005,7 @@ public class OrderStatService {
                 "AND t.create_time <=? \n" +
                 "AND t.isprepaid = 1 UNION\n" +
                 "SELECT\n" +
-                "t.customer_id,\n" +
+                "t.sn,t.customer_id,\n" +
                 "t.customer_name,\n" +
                 "t.weight,\n" +
                 "t.total_price,\n" +
@@ -2068,7 +2068,7 @@ public class OrderStatService {
                 "FROM\n" +
                 "(\n" +
                 "SELECT\n" +
-                "t.supermarket_id AS id,\n" +
+                "t.sn,t.supermarket_id AS id,\n" +
                 "t.customer_id,\n" +
                 "t.customer_name,\n" +
                 "t.weight,\n" +
@@ -2083,7 +2083,7 @@ public class OrderStatService {
                 "AND t.create_time <=? \n" +
                 "AND t.isprepaid = 1 UNION\n" +
                 "SELECT\n" +
-                "t.supermarket_id AS id,\n" +
+                "t.sn,t.supermarket_id AS id,\n" +
                 "t.customer_id,\n" +
                 "t.customer_name,\n" +
                 "t.weight,\n" +
@@ -2120,7 +2120,7 @@ public class OrderStatService {
                 "FROM\n" +
                 "(\n" +
                 "SELECT\n" +
-                "t.weight,\n" +
+                "t.sn,t.weight,\n" +
                 "t.total_price,\n" +
                 "t.product_id\n" +
                 "FROM\n" +
@@ -2131,7 +2131,7 @@ public class OrderStatService {
                 "AND t.create_time <=?\n" +
                 "AND t.isprepaid = 0 UNION\n" +
                 "SELECT\n" +
-                "t.weight,\n" +
+                "t.sn,t.weight,\n" +
                 "t.total_price,\n" +
                 "t.product_id\n" +
                 "FROM\n" +
@@ -2177,7 +2177,7 @@ public class OrderStatService {
                 "( SELECT id, NAME FROM supermarket ) m join \n" +
                 "(\n" +
                 "SELECT\n" +
-                "t.supermarket_id AS id,\n" +
+                "t.sn,t.supermarket_id AS id,\n" +
                 "t.weight,\n" +
                 "t.total_price FROM\n" +
                 "order_sale t \n" +
@@ -2187,7 +2187,7 @@ public class OrderStatService {
                 "AND t.create_time <=? \n" +
                 "AND t.isprepaid = 0 UNION\n" +
                 "SELECT\n" +
-                "t.supermarket_id AS id,\n" +
+                "t.sn,t.supermarket_id AS id,\n" +
                 "t.weight,\n" +
                 "t.total_price\n" +
                 "FROM\n" +