From c53f14a5c5d0bb6623987de84ef1bb8f8a8dbb3f Mon Sep 17 00:00:00 2001
From: yujian <yujian>
Date: 星期一, 14 一月 2019 18:13:24 +0800
Subject: [PATCH] Merge branch 'div1'
---
fanli/src/main/java/com/yeshi/fanli/mapping/order/CommonOrderMapper.xml | 90 +++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 90 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 ee95068..8fd88c8 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
@@ -95,6 +95,16 @@
<result column="totalCount" property="totalCount" jdbcType="INTEGER" />
<result column="totalSettlement" property="totalSettlement" jdbcType="DECIMAL" />
<result column="totalPayment" property="totalPayment" jdbcType="DECIMAL" />
+
+
+ <result column="userId" property="userId" jdbcType="VARCHAR" />
+ <result column="userName" property="userName" jdbcType="VARCHAR" />
+ <result column="userPortrait" property="userPortrait" jdbcType="VARCHAR" />
+
+ <result column="levelOneId" property="levelOneId" jdbcType="VARCHAR" />
+ <result column="levelOneMoney" property="levelOneMoney" jdbcType="VARCHAR" />
+ <result column="levelTwoId" property="levelTwoId" jdbcType="VARCHAR" />
+ <result column="levelTwoMoney" property="levelTwoMoney" jdbcType="VARCHAR" />
<association property="userInfo" column="co_uid"
resultMap="com.yeshi.fanli.dao.mybatis.UserInfoMapper.BaseResultMap">
@@ -105,6 +115,7 @@
</association>
</resultMap>
+
<sql id="Base_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,co_settle_time,co_order_by,co_create_time,co_update_time
</sql>
@@ -604,4 +615,83 @@
)A
</select>
+
+ <select id="listQuery" resultMap="ResultMap">
+
+ SELECT A.*,u.id AS userId,u.`nick_name` AS userName,u.`portrait` AS userPortrait,
+ pv2.`hb_uid` AS levelOneId,pv2.`hb_money` AS levelOneMoney,
+ ppv2.`hb_uid` AS levelTwoId,ppv2.`hb_money` AS levelTwoMoney
+
+ FROM (SELECT hb.hb_id,hb.hb_uid,hb.`hb_money` AS totalMoney,
+ hb.hb_state AS hongBaoState,
+ hb.`hb_type` AS hongBaoType,
+ hb.`hb_get_time` AS accountTime,
+ hb.`hb_pre_get_time` AS preAccountTime,
+ co.*,cog.*
+ FROM yeshi_ec_hongbao_order ho
+
+ LEFT JOIN (SELECT * FROM yeshi_ec_hongbao_v2 v2
+ WHERE 1=1
+ <include refid="SELECT_PARAM_HONGBAO_TYPE"/> <!-- 绾㈠寘绫诲瀷 -->
+ <include refid="SELECT_PARAM_HONGBAO_STATE"/> <!-- 绾㈠寘鐘舵�� -->
+ )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`
+ LEFT JOIN yeshi_ec_common_order_goods cog ON cog.`cog_id`= co.`co_order_goods_id`
+ WHERE hb.hb_id IS NOT NULL
+ <include refid="SELECT_PARAM_ORDER_STATE"/> <!-- 璁㈠崟鐘舵�� -->
+ <if test="startTime != null and startTime != '' ">
+ AND <![CDATA[co.co_third_create_time >= #{startTime}]]>
+ </if>
+ <if test="endTime != null and endTime != '' ">
+ AND <![CDATA[co.co_third_create_time <= #{endTime}]]>
+ </if>
+
+ <if test="key != null and key != '' ">
+ <if test="keyType == 1 ">
+ AND co.co_order_no = ${key}
+ </if>
+ <if test="keyType == 2 ">
+ AND hb.hb_uid like = ${key}
+ </if>
+ </if>
+
+ ORDER BY co.co_third_create_time DESC
+ LIMIT ${start},${count}
+ ) A
+ LEFT JOIN yeshi_ec_user u ON u.id = A.hb_uid
+ LEFT JOIN yeshi_ec_hongbao_v2 pv2 ON pv2.`hb_pid` = A.hb_id
+ LEFT JOIN yeshi_ec_hongbao_v2 ppv2 ON ppv2.`hb_pid` = A.hb_id
+
+ </select>
+
+ <select id="countQuery" resultType="java.lang.Long">
+ SELECT count(ho.ho_id)
+ FROM yeshi_ec_hongbao_order ho
+
+ LEFT JOIN (SELECT * FROM yeshi_ec_hongbao_v2 v2
+ WHERE 1=1
+ <include refid="SELECT_PARAM_HONGBAO_TYPE"/> <!-- 绾㈠寘绫诲瀷 -->
+ <include refid="SELECT_PARAM_HONGBAO_STATE"/> <!-- 绾㈠寘鐘舵�� -->
+ )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`
+ LEFT JOIN yeshi_ec_common_order_goods cog ON cog.`cog_id`= co.`co_order_goods_id`
+ WHERE hb.hb_id IS NOT NULL
+ <include refid="SELECT_PARAM_ORDER_STATE"/> <!-- 璁㈠崟鐘舵�� -->
+ <if test="startTime != null and startTime != '' ">
+ AND <![CDATA[co.co_third_create_time >= #{startTime}]]>
+ </if>
+ <if test="endTime != null and endTime != '' ">
+ AND <![CDATA[co.co_third_create_time <= #{endTime}]]>
+ </if>
+
+ <if test="key != null and key != '' ">
+ <if test="keyType == 1 ">
+ AND co.co_order_no = ${key}
+ </if>
+ <if test="keyType == 2 ">
+ AND hb.hb_uid like = ${key}
+ </if>
+ </if>
+ </select>
+
</mapper>
--
Gitblit v1.8.0