From 21a5d62894e6cca7d536ffcc1d63898ffaf16185 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期一, 25 二月 2019 11:41:17 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
fanli/src/main/java/com/yeshi/fanli/mapping/order/CommonOrderMapper.xml | 42 ++++++++++++++++++++++++++++++++++++++++--
1 files changed, 40 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 a8a6a07..659d4f6 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
@@ -86,6 +86,8 @@
<result column="co_update_time" property="updateTime" jdbcType="TIMESTAMP" />
<result column="totalMoney" property="hongBao" jdbcType="DECIMAL" />
+ <result column="couponMoney" property="couponMoney" jdbcType="DECIMAL" />
+
<result column="hongBaoState" property="hongBaoState" jdbcType="INTEGER" />
<result column="hongBaoType" property="hongBaoType" jdbcType="INTEGER" />
<result column="accountTime" property="accountTime" jdbcType="TIMESTAMP" />
@@ -347,7 +349,7 @@
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}
+ WHERE v2.`hb_uid`= #{uid} AND <![CDATA[v2.`hb_type`<> 10 ]]>
<include refid="SELECT_PARAM_HONGBAO_TYPE"/> <!-- 绾㈠寘绫诲瀷 -->
)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`
@@ -368,7 +370,7 @@
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}
+ WHERE v2.`hb_uid`= #{uid} AND <![CDATA[v2.`hb_type`<> 10 ]]>
<include refid="SELECT_PARAM_HONGBAO_TYPE"/> <!-- 绾㈠寘绫诲瀷 -->
)hb ON IF(hb.hb_pid IS NULL,hb.hb_id,hb.hb_pid)=ho.`ho_hongbao_id`
@@ -737,4 +739,40 @@
</if>
</select>
+ <select id="getCouponHongbaoByOrderNo" resultMap="ResultMap">
+ SELECT COALESCE(SUM(IF(hb.hb_type=1,hb.`hb_money`,0)),0)AS totalMoney,
+ COALESCE(SUM(IF(hb.hb_type=10,hb.`hb_money`,0)),0)AS couponMoney,
+ hb.`hb_type` AS hongBaoType,
+ MAX(hb.`hb_get_time`) AS accountTime,
+ MAX(hb.`hb_pre_get_time`) AS preAccountTime,
+ hb.hb_state AS hongBaoState,
+ <include refid="Order_Column_List"/>
+ FROM yeshi_ec_hongbao_order ho
+ LEFT JOIN (SELECT * FROM yeshi_ec_hongbao_v2 v2 WHERE v2.`hb_uid`= #{uid}
+ <if test="hongBaoState != null">
+ AND v2.`hb_state` = #{hongBaoState}
+ </if>
+ )hb ON hb.hb_id = 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 AND co.co_order_no = #{orderNo}
+ </select>
+
+ <select id="getCommonOrderByOrderNo" resultMap="ResultMap">
+ <!-- 鏌ヨ鐢ㄦ埛璁㈠崟 -->
+ SELECT COALESCE(SUM(hb.`hb_money`),0)AS totalMoney, COALESCE(SUM(co.`co_payment`),0)AS totalPayment,
+ hb.hb_state AS hongBaoState,
+ hb.`hb_type` AS hongBaoType,
+ <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 AND co.co_order_no = #{orderNo}
+ <if test="orderState != null">
+ AND co.co_state = #{orderState} <!-- 宸叉敹璐� -->
+ </if>
+ GROUP BY co.`co_order_no`, co.`co_source_type`
+ </select>
+
</mapper>
--
Gitblit v1.8.0