From c456fef6fb79478715d6f70474d37689f046b3bf Mon Sep 17 00:00:00 2001
From: wuwenxiong <646448316@qq.com>
Date: Tue, 4 Jan 2022 03:52:10 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96-5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../cowr/ssjygl/stat/sale/OrderStatService.java    | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 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 fcd073d..b261fe1 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
@@ -2946,12 +2946,15 @@ public class OrderStatService {
 
         List<Object> shParamsList = new ArrayList<>();
         shParamsList.add(OrderStateEnum.RECEIVED.getStateid());
+        List<Object> yhParamsList = new ArrayList<>();
+        yhParamsList.add(OrderStateEnum.RECEIVED.getStateid());
         String shParams = "";
         String yhParams = "";
         if (!StrKit.isBlank(tm)) {
             shParams += " and t.create_time like ? \n";
-            yhParams += " and t.create_time like '" + tm + "%'\n";
+            yhParams += " and t.create_time like ? \n";
             shParamsList.add(tm + "%");
+            yhParamsList.add(tm + "%");
         }
          // 实售
          List<Record> shList = Db.find(
@@ -2961,8 +2964,9 @@ public class OrderStatService {
                          "     select t.id, t.product_id, count(*) as orderCount, sum(t.total_price) as totalPrice, sum(t.weight) as weight\n" +
                          "     from (\n" +
                          "         select t.supermarket_id as id, t.paid, t.total_price, t.weight, t.product_id\n" +
-                         "         from order_temp t\n" +
-                         "         where t.state = ? \n" +
+                         "         from order_temp t \n" +
+                         "         where t.sale_type = 0 \n" +
+                         "         and  t.state = ? \n" +
                          shParams +
                          "     ) t\n" +
                          "     group by t.id, t.product_id\n" +
@@ -2978,10 +2982,10 @@ public class OrderStatService {
                          "	`order_temp` t\n" +
                          "WHERE\n" +
                          " t.sale_type = 1\n" +
-                         "	and t.state = 5\n" +
+                         "	and t.state = ?\n" +
                          yhParams +
                          " GROUP BY\n" +
-                         "	t.supermarket_id");
+                         "	t.supermarket_id", yhParamsList.toArray());
 
      List<Record> retChildren = new ArrayList<>();
      List<Record> retList = new ArrayList<>();