From 17f5bded9edd9f9db190745b582a1611108d6413 Mon Sep 17 00:00:00 2001
From: yujian <yujian>
Date: 星期五, 15 二月 2019 09:06:23 +0800
Subject: [PATCH] Merge branch 'div'
---
fanli/src/main/java/com/yeshi/fanli/mapping/order/CommonOrderMapper.xml | 23 ++++++++++++++++++-----
1 files changed, 18 insertions(+), 5 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 a25a7d9..40cb5ae 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
@@ -589,6 +589,20 @@
)A
</select>
+
+
+ <sql id="SELECT_HONGBAO_STATE">
+ <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>
+ </sql>
+
<select id="listQueryByUid" resultMap="ResultMap">
<!-- 鏌ヨ鐢ㄦ埛璁㈠崟 -->
SELECT hb.`hb_money` AS totalMoney,
@@ -602,7 +616,7 @@
LEFT JOIN (SELECT * FROM yeshi_ec_hongbao_v2 v2
WHERE v2.`hb_uid`= #{uid}
<include refid="SELECT_PARAM_HONGBAO_TYPE"/> <!-- 绾㈠寘绫诲瀷 -->
- <include refid="SELECT_PARAM_HONGBAO_STATE"/> <!-- 绾㈠寘鐘舵�� -->
+ <include refid="SELECT_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`
@@ -623,7 +637,7 @@
LEFT JOIN (SELECT * FROM yeshi_ec_hongbao_v2 v2
WHERE v2.`hb_uid`= #{uid}
<include refid="SELECT_PARAM_HONGBAO_TYPE"/> <!-- 绾㈠寘绫诲瀷 -->
- <include refid="SELECT_PARAM_HONGBAO_STATE"/> <!-- 绾㈠寘鐘舵�� -->
+ <include refid="SELECT_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`
@@ -662,7 +676,7 @@
LEFT JOIN (SELECT * FROM yeshi_ec_hongbao_v2 v2
WHERE 1=1
<include refid="SELECT_PARAM_HONGBAO_TYPE"/> <!-- 绾㈠寘绫诲瀷 -->
- <include refid="SELECT_PARAM_HONGBAO_STATE"/> <!-- 绾㈠寘鐘舵�� -->
+ <include refid="SELECT_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`
@@ -700,13 +714,12 @@
LEFT JOIN (SELECT * FROM yeshi_ec_hongbao_v2 v2
WHERE 1=1
<include refid="SELECT_PARAM_HONGBAO_TYPE"/> <!-- 绾㈠寘绫诲瀷 -->
- <include refid="SELECT_PARAM_HONGBAO_STATE"/> <!-- 绾㈠寘鐘舵�� -->
+ <include refid="SELECT_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>
--
Gitblit v1.8.0