From a3ead770c30b310b9b1b7e3786d5d847da540e55 Mon Sep 17 00:00:00 2001
From: yujian <yujian@163.com>
Date: 星期三, 25 十二月 2019 12:21:20 +0800
Subject: [PATCH] 2.0.6

---
 fanli/src/main/java/com/yeshi/fanli/mapping/order/CommonOrderMapper.xml |   30 ++++++++++++++++++++++++++++++
 1 files changed, 30 insertions(+), 0 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 babf330..c2f7ce4 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
@@ -1060,4 +1060,34 @@
 		DATE_SUB(NOW(), INTERVAL 1 DAY) GROUP BY
 		co.`co_order_no`,co.`co_source_type`)A
 	</select>
+	
+	<select id="searchOrderByUid" resultMap="ResultMap">
+		SELECT COALESCE(SUM(hb.`hb_money`),0)AS totalMoney, hb.hb_state AS hongBaoState, hb.`hb_type` AS hongBaoType, 
+			MAX(hb.`hb_get_time`) AS accountTime, MAX(hb.`hb_pre_get_time`) AS preAccountTime, <include refid="Order_Column_List" />
+		FROM yeshi_ec_hongbao_order ho 
+		LEFT JOIN (SELECT <include refid="Hongbao_Column_List" /> FROM yeshi_ec_hongbao_v2 v2 
+				   WHERE v2.`hb_uid`= #{uid} AND <![CDATA[v2.`hb_type`<>10]]>)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
+		<foreach collection="list" item="esOrder" open=" and ("	close=")" separator=" or ">
+			(co.co_trade_id=#{esOrder.tradeId} AND co.co_source_type = #{esOrder.platform})
+		</foreach>
+		GROUP BY co.`co_order_no`, co.`co_source_type` 
+		ORDER BY co.co_third_create_time DESC 
+		LIMIT ${start},${count}
+	</select>
+	
+	<select id="countSearchOrderByUid" resultType="java.lang.Long">
+		SELECT IFNULL(COUNT(ho_id),0) FROM (SELECT ho.ho_id FROM
+		yeshi_ec_hongbao_order ho LEFT JOIN (SELECT <include refid="Hongbao_Column_List" />
+			FROM yeshi_ec_hongbao_v2 v2 WHERE v2.`hb_uid`= #{uid} AND <![CDATA[v2.`hb_type`<> 10 ]]>
+		)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
+		<foreach collection="list" item="esOrder" open=" and ("	close=")" separator=" or ">
+			(co.co_trade_id=#{esOrder.tradeId} AND co.co_source_type = #{esOrder.platform})
+		</foreach>
+		GROUP BY co.`co_order_no`, co.`co_source_type` )A
+	</select>
 </mapper>

--
Gitblit v1.8.0