From 8d38972b593b5ba698b0e605039ed8c795eaaef5 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期二, 03 十二月 2019 17:35:51 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into div
---
fanli/src/main/java/com/yeshi/fanli/mapping/order/CommonOrderMapper.xml | 24 ++++++++++++++++--------
1 files changed, 16 insertions(+), 8 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 32e5f57..cce24c1 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
@@ -413,12 +413,6 @@
<if test="type != null and type == 3"> <!-- 閭�璇疯鍗� -->
AND (v2.`hb_type` = 5 OR v2.`hb_type` = 6 OR v2.`hb_type` = 7 OR v2.`hb_type` = 21 OR v2.`hb_type` = 22)
</if>
- <if test="type == 2 and day == 5"> <!-- 鏈湀鏈堝皢瑕佸埌璐� -->
- AND PERIOD_DIFF(DATE_FORMAT(NOW(), '%Y%m'), DATE_FORMAT(v2.`hb_pre_get_time`, '%Y%m')) = 1
- </if>
- <if test="type == 3 and day == 5"> <!-- 鏈湀灏嗚鍒拌处 -->
- AND PERIOD_DIFF(DATE_FORMAT(NOW(), '%Y%m'), DATE_FORMAT(v2.`hb_pre_get_time`, '%Y%m')) = 1
- </if>
</sql>
<sql id="SELECT_PARAM_HONGBAO_STATE">
<if test="state != null and state == 1">
@@ -449,6 +443,14 @@
<include refid="Hongbao_Column_List" />
FROM yeshi_ec_hongbao_v2 v2 WHERE v2.`hb_uid`= #{uid} AND <![CDATA[v2.`hb_type`<> 10 ]]>
<include refid="SELECT_PARAM_HONGBAO_TYPE" />
+
+ <if test="type == 2 and day == 5"> <!-- 鏈湀鏈堝皢瑕佸埌璐� -->
+ AND PERIOD_DIFF(DATE_FORMAT(NOW(), '%Y%m'), DATE_FORMAT(v2.`hb_pre_get_time`, '%Y%m')) = 1
+ </if>
+ <if test="type == 3 and day == 5"> <!-- 鏈湀灏嗚鍒拌处 -->
+ AND PERIOD_DIFF(DATE_FORMAT(NOW(), '%Y%m'), DATE_FORMAT(v2.`hb_pre_get_time`, '%Y%m')) = 1
+ </if>
+
<!-- 绾㈠寘绫诲瀷 -->
)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`
@@ -473,8 +475,14 @@
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 ]]>
- <include refid="SELECT_PARAM_HONGBAO_TYPE" />
- <!-- 绾㈠寘绫诲瀷 -->
+ <include refid="SELECT_PARAM_HONGBAO_TYPE" /> <!-- 绾㈠寘绫诲瀷 -->
+
+ <if test="type == 2 and day == 5"> <!-- 鏈湀鏈堝皢瑕佸埌璐� -->
+ AND PERIOD_DIFF(DATE_FORMAT(NOW(), '%Y%m'), DATE_FORMAT(v2.`hb_pre_get_time`, '%Y%m')) = 1
+ </if>
+ <if test="type == 3 and day == 5"> <!-- 鏈湀灏嗚鍒拌处 -->
+ AND PERIOD_DIFF(DATE_FORMAT(NOW(), '%Y%m'), DATE_FORMAT(v2.`hb_pre_get_time`, '%Y%m')) = 1
+ </if>
)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
--
Gitblit v1.8.0