From 6919173bc3cb356fa0f7ab67735ccd25fb4c3186 Mon Sep 17 00:00:00 2001
From: wany <13995595726@qq.com>
Date: Wed, 12 Mar 2025 17:35:14 +0800
Subject: [PATCH] =?UTF-8?q?bug=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ssjygl/order/ordertemp/OrderTempService.java    |  2 +-
 .../com/cowr/ssjygl/stat/sale/OrderStatService.java | 13 ++++++++-----
 2 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/ssjygl-xsct-common/src/main/java/com/cowr/ssjygl/order/ordertemp/OrderTempService.java b/ssjygl-xsct-common/src/main/java/com/cowr/ssjygl/order/ordertemp/OrderTempService.java
index e18dd88..0199f95 100644
--- a/ssjygl-xsct-common/src/main/java/com/cowr/ssjygl/order/ordertemp/OrderTempService.java
+++ b/ssjygl-xsct-common/src/main/java/com/cowr/ssjygl/order/ordertemp/OrderTempService.java
@@ -101,7 +101,7 @@ public class OrderTempService extends BaseService {
                              Integer product_id,
                              Boolean invoice_code_is_null
     ) {
-        String selectsql = "select t.* ,t.sn as old_sn" +
+        String selectsql = "select t.* ,t.sn as old_sn,t.ticket_code as old_ticket_code" +
                 ", p.in_time, p.out_time, p.in_which, p.out_which, p.in_mode, p.out_mode \n" +
                 ", p.first_weight, p.second_weight, p.first_weigh_mode, p.second_weight_mode \n" +
                 ", p.first_pic, p.first_weight_which, p.second_weight_which, p.second_pic \n" +
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 a5001c8..0aca3fc 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
@@ -673,7 +673,6 @@ public class OrderStatService {
                 " ) t ON s.id = t.sandfarm_id \n" +
                 "WHERE\n" +
                 " s.type = 1 \n" +
-                " and s.isdeploy = 1 \n" +
                 "GROUP BY\n" +
                 " s.id \n" +
                 "ORDER BY\n" +
@@ -3685,8 +3684,10 @@ public class OrderStatService {
                 "FROM\n" +
                 "	supermarket t\n" +
                 "WHERE\n" +
-                "	id <= 6\n" +
-                "OR id = 11 or id = 12 ");
+                "t.type = 0"
+//                "	id <= 6\n" +
+//                "OR id = 11 or id = 12 "
+        );
 
         // 预售金额统计
         List<Object> paraList1 = new ArrayList<>();
@@ -4521,8 +4522,10 @@ public class OrderStatService {
                 "FROM\n" +
                 "	supermarket t\n" +
                 "WHERE\n" +
-                "	id <= 6\n" +
-                "OR id = 11 or id = 12 ");
+//                "	id <= 6\n" +
+//                "OR id = 11 or id = 12 "
+                "t.type = 0 "
+        );
 
         List<Object> shParamsList = new ArrayList<>();
         List<Object> yhParamsList = new ArrayList<>();