From 5ea0046f422a3e84ad89a93dff33fe8ccb7cbbfb Mon Sep 17 00:00:00 2001
From: yujian <yujian>
Date: 星期二, 29 一月 2019 16:46:40 +0800
Subject: [PATCH] 取有效订单结算时间

---
 fanli/src/main/java/com/yeshi/fanli/mapping/order/CommonOrderMapper.xml |   16 ++++++++++++++--
 1 files changed, 14 insertions(+), 2 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 f5c68ff..a25a7d9 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
@@ -323,6 +323,18 @@
 		hb_id,hb_uid,hb_urank,hb_pid,hb_type,hb_state,hb_pre_get_time,hb_get_time,hb_version,
 		IF(v2.`hb_state` = 4, 0, v2.hb_money)AS hb_money
 	</sql>
+	
+	<sql id="Order_Column_List">
+		co_id,co_uid,co_order_no,co_source_type,co_source_position,
+		co_order_goods_id,co_count,co_state,co_state_whole_order,
+		co_estimate,co_eIncome,co_payment,co_settlement,
+		co_third_create_time,
+		MAX(co_settle_time) AS co_settle_time,
+		co_order_by,
+		co_create_time,
+		co_update_time
+	</sql>
+	
 
 	<select id="listUserOrder" resultMap="ResultMap">   
 	    <!-- 鏌ヨ鐢ㄦ埛璁㈠崟 -->
@@ -330,8 +342,8 @@
 				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,
-				co.*
+				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 

--
Gitblit v1.8.0