From 051e1e78cd217d14ca34c26afe485b6c9c85c01d Mon Sep 17 00:00:00 2001
From: yujian <yujian@123.com>
Date: 星期四, 12 九月 2019 16:42:04 +0800
Subject: [PATCH] 订单调整

---
 fanli/src/main/java/com/yeshi/fanli/mapping/order/CommonOrderMapper.xml |   56 ++++++++++++++++++++++++++++++++++++++++++++++++--------
 1 files changed, 48 insertions(+), 8 deletions(-)

diff --git a/fanli/src/main/java/com/yeshi/fanli/mapping/order/CommonOrderMapper.xml b/fanli/src/main/java/com/yeshi/fanli/mapping/order/CommonOrderMapper.xml
index 721a8ee..acdd03f 100644
--- a/fanli/src/main/java/com/yeshi/fanli/mapping/order/CommonOrderMapper.xml
+++ b/fanli/src/main/java/com/yeshi/fanli/mapping/order/CommonOrderMapper.xml
@@ -592,11 +592,51 @@
 		GROUP BY co.`co_order_no`, co.`co_source_type`)SX )A
 	</select>
 
-
+	<select id="countUserOrderToApp" resultType="Long">
+			<!-- 鏈夋晥璁㈠崟 -->
+		SELECT IFNULL(COUNT(ho_id),0) FROM
+			(SELECT ho.`ho_id` FROM yeshi_ec_hongbao_order ho 
+			  LEFT JOIN 
+			   ( SELECT * FROM yeshi_ec_hongbao_v2 v2 
+			     WHERE v2.`hb_uid`=${uid}
+					<include refid="SELECT_PARAM_HONGBAO_TYPE" />
+					<if test="state != null and state == 1">
+						<!-- 鏈埌璐� -->
+						AND (v2.hb_state = 1 or v2.hb_state = 2)
+					</if>
+					<if test="state != null and state == 2">
+						<!-- 宸插埌璐� -->
+						AND v2.hb_state = 3
+					</if>
+					<if test="state != null and state == 3">
+						<!-- 绾㈠寘宸插け鏁� -->
+						AND v2.hb_state =4 
+					</if>
+				) hb ON IF(hb.hb_pid IS NULL,hb.hb_id,hb.hb_pid)=ho.`ho_hongbao_id`
+		    LEFT JOIN yeshi_ec_common_order co ON co.`co_id`=ho.`ho_order_id`
+		    WHERE hb.hb_id IS NOT NULL <![CDATA[AND co.`co_state` <> 3]]>
+			<if test="stateOrder == 1"> <!-- 鏈夋晥璁㈠崟 -->
+				AND (co.`co_state_whole_order` =1 OR co.`co_state_whole_order` = 2)
+			</if>
+			<if test="stateOrder == 2"> <!-- 缁存潈璁㈠崟 -->
+				AND co.`co_state` = 3
+			</if>
+			<if test="stateOrder == 3"> <!-- 澶辨晥璁㈠崟 -->
+				AND co.`co_state_whole_order` = 3
+			</if>
+			<!-- 璁㈠崟鏃堕棿 -->
+			<include refid="SELECT_PARAM_ORDER_CREATE_TIME" />
+			<!-- 璁㈠崟鏉ユ簮 -->
+			<if test="source != null">AND co.co_source_type = #{source}</if>
+			GROUP BY co.`co_order_no`, co.`co_source_type`
+			)A
+	</select>
+	
+	<!-- 
 	<select id="countByUidAndOrderState" resultType="java.util.HashMap">
 		SELECT SUM(A.valid)AS totalValid, SUM(A.proces)AS
 		totalProces,SUM(A.Invalid)AS totalInvite FROM (
-		<!-- 鏈夋晥璁㈠崟 -->
+		鏈夋晥璁㈠崟
 		SELECT IFNULL(COUNT(ho_id),0) AS valid,0 AS proces,0 AS Invalid FROM
 		(SELECT ho.`ho_id` FROM yeshi_ec_hongbao_order ho LEFT JOIN ( SELECT *
 		FROM yeshi_ec_hongbao_v2 v2 WHERE v2.`hb_uid`=${uid}
@@ -606,13 +646,13 @@
 		WHERE hb.hb_id IS NOT NULL <![CDATA[AND co.`co_state` <> 3]]>
 		AND (co.`co_state_whole_order` =1 OR co.`co_state_whole_order` = 2)
 		<include refid="SELECT_PARAM_ORDER_CREATE_TIME" />
-		<!-- 璁㈠崟鏉ユ簮 -->
+		璁㈠崟鏉ユ簮
 		<if test="source != null">AND co.co_source_type = #{source}</if>
 		GROUP BY co.`co_order_no`, co.`co_source_type`)YX
 
 		UNION ALL
 
-		<!-- 缁存潈璁㈠崟 -->
+		缁存潈璁㈠崟
 		SELECT 0 AS valid,IFNULL(COUNT(ho_id),0) AS proces,0 AS Invalid FROM
 		(SELECT ho.`ho_id` FROM yeshi_ec_hongbao_order ho LEFT JOIN ( SELECT *
 		FROM yeshi_ec_hongbao_v2 v2 WHERE v2.`hb_uid`=${uid}
@@ -621,13 +661,13 @@
 		LEFT JOIN yeshi_ec_common_order co ON co.`co_id`=ho.`ho_order_id`
 		WHERE hb.hb_id IS NOT NULL AND co.`co_state` = 3
 		<include refid="SELECT_PARAM_ORDER_CREATE_TIME" />
-		<!-- 璁㈠崟鏉ユ簮 -->
+		璁㈠崟鏉ユ簮
 		<if test="source != null">AND co.co_source_type = #{source}</if>
 		GROUP BY co.`co_order_no`, co.`co_source_type`)WQ
 
 		UNION ALL
 
-		<!-- 澶辨晥璁㈠崟 -->
+		澶辨晥璁㈠崟
 		SELECT 0 AS valid,0 AS proces,IFNULL(COUNT(ho_id),0) AS Invalid FROM
 		(SELECT ho.`ho_id` FROM yeshi_ec_hongbao_order ho LEFT JOIN ( SELECT *
 		FROM yeshi_ec_hongbao_v2 v2 WHERE v2.`hb_uid`=${uid}
@@ -636,10 +676,10 @@
 		LEFT JOIN yeshi_ec_common_order co ON co.`co_id`=ho.`ho_order_id`
 		WHERE hb.hb_id IS NOT NULL AND co.`co_state_whole_order` = 3
 		<include refid="SELECT_PARAM_ORDER_CREATE_TIME" />
-		<!-- 璁㈠崟鏉ユ簮 -->
+		璁㈠崟鏉ユ簮
 		<if test="source != null">AND co.co_source_type = #{source}</if>
 		GROUP BY co.`co_order_no`, co.`co_source_type`)SX )A
-	</select>
+	</select> -->
 	<select id="countBonusOrderNumber" resultType="java.lang.Long">
 		<!-- 濂栭噾缁熻锛氳鍗曟暟閲� -->
 		SELECT IFNULL(COUNT(ho_id),0) FROM (SELECT ho.`ho_id` FROM

--
Gitblit v1.8.0