From f6f077410652772400b171da9a5b739d7ab0e7cc Mon Sep 17 00:00:00 2001
From: wuwenxiong <646448316@qq.com>
Date: Wed, 9 Mar 2022 10:21:36 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8F=AF=E9=85=8D=E4=BD=99=E9=A2=9D=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../presellorder/PresellOrderService.java     | 44 ++++++++++++-------
 1 file changed, 27 insertions(+), 17 deletions(-)

diff --git a/ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/presellorder/PresellOrderService.java b/ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/presellorder/PresellOrderService.java
index 8d0e323..e397e3f 100644
--- a/ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/presellorder/PresellOrderService.java
+++ b/ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/presellorder/PresellOrderService.java
@@ -197,9 +197,10 @@ public class PresellOrderService extends BaseService {
         params.add(id);
         params.add(id);
         params.add(id);
+        params.add(id);
 
         String sql = "SELECT\n" +
-                "	  IFNULL(\n" +
+                "	IFNULL(\n" +
                 "		(\n" +
                 "			SELECT\n" +
                 "				(\n" +
@@ -216,22 +217,31 @@ public class PresellOrderService extends BaseService {
                 "						0\n" +
                 "					)\n" +
                 "				) - (\n" +
-                 "                	 IFNULL(\n" +
-                 "                		(\n" +
-                 "                		SELECT\n" +
-                 "                		sum(\n" +
-                 "                		t.total_price\n" +
-                 "                			)\n" +
-                 "                		FROM\n" +
-                 "                			order_temp t\n" +
-                 "                			WHERE\n" +
-                 "                		t.sale_type = 1\n" +
-                 "                			AND t.state = 5\n" +
-                 "                			AND t.customer_id = ?\n" +
-                 "                			),\n" +
-                 "                		0\n" +
-                 "                	)\n" +
-                "             ) - (\n" +
+                "					IFNULL(\n" +
+                "						(\n" +
+                "							SELECT\n" +
+                "								sum(t.total_price)\n" +
+                "							FROM\n" +
+                "								order_temp t\n" +
+                "							WHERE\n" +
+                "								t.sale_type = 1\n" +
+                "							AND t.state = 5\n" +
+                "							AND t.customer_id = ?\n" +
+                "							AND NOT EXISTS (\n" +
+                "								SELECT\n" +
+                "									*\n" +
+                "								FROM\n" +
+                "									ordercluster c\n" +
+                "								WHERE\n" +
+                "									c.sale_type = 1\n" +
+                "								AND c.state < 5\n" +
+                "								AND c.customer_id = ?\n" +
+                "								AND t.ordercluster_id = c.id\n" +
+                "							)\n" +
+                "						),\n" +
+                "						0\n" +
+                "					)\n" +
+                "				) - (\n" +
                 "					IFNULL(\n" +
                 "						(\n" +
                 "							SELECT\n" +