From e21857352fe6d5f1300d8401189097ca655f7b84 Mon Sep 17 00:00:00 2001
From: huangww <cnhuangww@gmail.com>
Date: Sat, 15 Sep 2018 20:22:31 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0sql?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 53项目部署说明书/v2.5.0/insertSQL.sql | 47 +++++++++++++-------
 1 file changed, 30 insertions(+), 17 deletions(-)

diff --git a/53项目部署说明书/v2.5.0/insertSQL.sql b/53项目部署说明书/v2.5.0/insertSQL.sql
index 50cff05..97e1582 100644
--- a/53项目部署说明书/v2.5.0/insertSQL.sql
+++ b/53项目部署说明书/v2.5.0/insertSQL.sql
@@ -35,6 +35,7 @@ SELECT
 	b.time_type,
 	b.`status`,
 	b.card_no,
+	b.card_type,
 	s.serve_no,
 	c.id cleaner_id,
 	c.nick_name cleaner_name,
@@ -50,20 +51,32 @@ AND b.del_flag = '0';
 
 
 CREATE VIEW v_consuner_order_and_card AS
-SELECT o.order_no,o.created_at,o.origin_total_price,o.pay_price,
-		s.card_no as service_card_no,s.card_type,s.total_service_cnt,s.serviced_cnt,s.booked_cnt
-		,IFNULL(r.commission,'0') commission
-	 FROM vorder o
-	LEFT JOIN service_card s 
-	ON o.order_no = s.order_no
-	LEFT JOIN 
-	(
-		SELECT order_no, commission from user_recommend
-		where status = '1'
-	) r
-	ON o.order_no = r.order_no
-	WHERE 1=1
-	AND o.`status` in ('10','11')
-	AND s.`status` < 40
-	AND o.del_flag = '0'
-	AND s.del_flag = '0';
+SELECT
+	o.order_no,
+	o.created_at,
+	o.origin_total_price,
+	o.pay_price,
+	s.card_no AS service_card_no,
+	s.card_type AS service_card_type,
+	s.total_service_cnt,
+	s.serviced_cnt,
+	s.booked_cnt,
+	IFNULL(r.commission, '0') commission
+FROM
+	vorder o
+LEFT JOIN service_card s ON o.order_no = s.order_no
+LEFT JOIN (
+	SELECT
+		order_no,
+		commission
+	FROM
+		user_recommend
+	WHERE
+		status = '1'
+) r ON o.order_no = r.order_no
+WHERE
+	1 = 1
+AND o.`status` IN ('10', '11')
+AND s.`status` < 40
+AND o.del_flag = '0'
+AND s.del_flag = '0';