From 02caf17e1d7d92d1357f7e3a43cc50f08e53ffed Mon Sep 17 00:00:00 2001
From: wuwenxiong <646448316@qq.com>
Date: Fri, 7 Jan 2022 17:12:33 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B9=B4=E7=BB=9F=E8=AE=A1=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/cowr/ssjygl/stat/sale/OrderStatService.java     | 5 +++++
 1 file changed, 5 insertions(+)

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 e9f329c..20bd002 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
@@ -3090,10 +3090,12 @@ public class OrderStatService {
          }
          if (shList2.size() > 1) {
              for (Record s1 : shList2) {
+                 boolean flag = false;
                  for (Record s2 : shList2) {
                      int s1_id = s1.getInt("id");
                      int s2_id = s2.getInt("id");
                      if ((s1_id == 1 && s2_id == 7) || (s1_id == 5 && s2_id == 9) ||s1_id == 6 && s2_id == 8) {
+                         flag = true;
                          Record s3 = new Record();
 
                          int order_num;
@@ -3122,6 +3124,9 @@ public class OrderStatService {
                          break;
                      }
                  }
+                 if (!flag) {
+                     shList1.add(s1);
+                 }
              }
          } else if (shList2.size() == 1) {
              shList1.addAll(shList2);