From 407157c46e82f44b592ad18dd4367bc19209f909 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期六, 05 一月 2019 15:08:38 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
fanli/src/main/java/com/yeshi/fanli/mapping/order/CommonOrderMapper.xml | 42 ++++++++++++++++++++----------------------
1 files changed, 20 insertions(+), 22 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 fa84721..c3c3438 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
@@ -248,10 +248,10 @@
AND (th.hb_type =1 or th.hb_type =2)
</if>
<if test="type != null and type == 2"> <!-- 鍒嗕韩璁㈠崟 -->
- AND (th.`hb_type` = 20 OR th.`hb_type` = 21 OR th.`hb_type` = 22)
+ AND th.`hb_type` = 20
</if>
<if test="type != null and type == 3"> <!-- 閭�璇疯鍗� -->
- AND (th.`hb_type` = 5 OR th.`hb_type` = 6 OR th.`hb_type` = 7)
+ AND (th.`hb_type` = 5 OR th.`hb_type` = 6 OR th.`hb_type` = 7 OR th.`hb_type` = 21 OR th.`hb_type` = 22)
</if>
<if test="orderNo != null">
AND tc.co_order_no = #{orderNo}
@@ -304,10 +304,10 @@
AND (th.hb_type =1 or th.hb_type =2)
</if>
<if test="type != null and type == 2"> <!-- 鍒嗕韩璁㈠崟 -->
- AND (th.`hb_type` = 20 OR th.`hb_type` = 21 OR th.`hb_type` = 22)
+ AND th.`hb_type` = 20
</if>
<if test="type != null and type == 3"> <!-- 閭�璇疯鍗� -->
- AND (th.`hb_type` = 5 OR th.`hb_type` = 6 OR th.`hb_type` = 7)
+ AND (th.`hb_type` = 5 OR th.`hb_type` = 6 OR th.`hb_type` = 7 OR th.`hb_type` = 21 OR th.`hb_type` = 22)
</if>
<if test="orderNo != null">
AND tc.co_order_no = #{orderNo}
@@ -357,10 +357,10 @@
AND (th.hb_type =1 or th.hb_type =2)
</if>
<if test="type != null and type == 2"> <!-- 鍒嗕韩璁㈠崟 -->
- AND (th.`hb_type` = 20 OR th.`hb_type` = 21 OR th.`hb_type` = 22)
+ AND th.`hb_type` = 20
</if>
<if test="type != null and type == 3"> <!-- 閭�璇疯鍗� -->
- AND (th.`hb_type` = 5 OR th.`hb_type` = 6 OR th.`hb_type` = 7)
+ AND (th.`hb_type` = 5 OR th.`hb_type` = 6 OR th.`hb_type` = 7 OR th.`hb_type` = 21 OR th.`hb_type` = 22)
</if>
<if test="orderState != null and orderState == 1">
@@ -448,8 +448,7 @@
(tr.`ho_hongbao_id` = th.`hb_id` OR
th.`hb_pid` = tr.`ho_hongbao_id` )
WHERE th.`hb_uid` = ${uid}
- AND (th.`hb_type` = 20 OR th.`hb_type` = 21
- OR th.`hb_type` = 22)
+ AND th.`hb_type` = 20
<if test="day != null and day == 1">
AND TO_DAYS(tc.`co_create_time`) = TO_DAYS(NOW())
</if>
@@ -466,8 +465,7 @@
(tr.`ho_hongbao_id` = th.`hb_id` OR
th.`hb_pid` = tr.`ho_hongbao_id` )
WHERE th.`hb_uid` = ${uid}
- AND (th.`hb_type` = 5 OR th.`hb_type` = 6 OR
- th.`hb_type` = 7)
+ AND (th.`hb_type` = 5 OR th.`hb_type` = 6 OR th.`hb_type` = 7 OR th.`hb_type` = 21 OR th.`hb_type` = 22 )
<if test="day != null and day == 1">
AND TO_DAYS(tc.`co_create_time`) = TO_DAYS(NOW())
</if>
@@ -495,10 +493,10 @@
AND (th.hb_type =1 or th.hb_type =2)
</if>
<if test="type != null and type == 2"> <!-- 鍒嗕韩璁㈠崟 -->
- AND (th.`hb_type` = 20 OR th.`hb_type` = 21 OR th.`hb_type` = 22)
+ AND th.`hb_type` = 20
</if>
<if test="type != null and type == 3"> <!-- 閭�璇疯鍗� -->
- AND (th.`hb_type` = 5 OR th.`hb_type` = 6 OR th.`hb_type` = 7)
+ AND (th.`hb_type` = 5 OR th.`hb_type` = 6 OR th.`hb_type` = 7 OR th.`hb_type` = 21 OR th.`hb_type` = 22)
</if>
<if test="startTime != null">
AND <![CDATA[tc.co_create_time >= #{startTime}]]>
@@ -538,10 +536,10 @@
AND (th.hb_type =1 or th.hb_type =2)
</if>
<if test="type != null and type == 2"> <!-- 鍒嗕韩璁㈠崟 -->
- AND (th.`hb_type` = 20 OR th.`hb_type` = 21 OR th.`hb_type` = 22)
+ AND th.`hb_type` = 20
</if>
<if test="type != null and type == 3"> <!-- 閭�璇疯鍗� -->
- AND (th.`hb_type` = 5 OR th.`hb_type` = 6 OR th.`hb_type` = 7)
+ AND (th.`hb_type` = 5 OR th.`hb_type` = 6 OR th.`hb_type` = 7 OR th.`hb_type` = 21 OR th.`hb_type` = 22)
</if>
<if test="startTime != null">
AND <![CDATA[tc.co_create_time >= #{startTime}]]>
@@ -580,10 +578,10 @@
AND (th.hb_type =1 or th.hb_type =2)
</if>
<if test="type != null and type == 2"> <!-- 鍒嗕韩璁㈠崟 -->
- AND (th.`hb_type` = 20 OR th.`hb_type` = 21 OR th.`hb_type` = 22)
+ AND th.`hb_type` = 20
</if>
<if test="type != null and type == 3"> <!-- 閭�璇疯鍗� -->
- AND (th.`hb_type` = 5 OR th.`hb_type` = 6 OR th.`hb_type` = 7)
+ AND (th.`hb_type` = 5 OR th.`hb_type` = 6 OR th.`hb_type` = 7 OR th.`hb_type` = 21 OR th.`hb_type` = 22)
</if>
<if test="startTime != null">
AND <![CDATA[tc.co_create_time >= #{startTime}]]>
@@ -623,10 +621,10 @@
AND (th.hb_type =1 or th.hb_type =2)
</if>
<if test="type != null and type == 2"> <!-- 鍒嗕韩璁㈠崟 -->
- AND (th.`hb_type` = 20 OR th.`hb_type` = 21 OR th.`hb_type` = 22)
+ AND th.`hb_type` = 20
</if>
<if test="type != null and type == 3"> <!-- 閭�璇疯鍗� -->
- AND (th.`hb_type` = 5 OR th.`hb_type` = 6 OR th.`hb_type` = 7)
+ AND (th.`hb_type` = 5 OR th.`hb_type` = 6 OR th.`hb_type` = 7 OR th.`hb_type` = 21 OR th.`hb_type` = 22)
</if>
<if test="day != null and day == 1"> <!-- 浠婂ぉ -->
@@ -661,10 +659,10 @@
AND (th.hb_type =1 or th.hb_type =2)
</if>
<if test="type != null and type == 2"> <!-- 鍒嗕韩璁㈠崟 -->
- AND (th.`hb_type` = 20 OR th.`hb_type` = 21 OR th.`hb_type` = 22)
+ AND th.`hb_type` = 20
</if>
<if test="type != null and type == 3"> <!-- 閭�璇疯鍗� -->
- AND (th.`hb_type` = 5 OR th.`hb_type` = 6 OR th.`hb_type` = 7)
+ AND (th.`hb_type` = 5 OR th.`hb_type` = 6 OR th.`hb_type` = 7 OR th.`hb_type` = 21 OR th.`hb_type` = 22)
</if>
<if test="day != null and day == 1"> <!-- 浠婂ぉ -->
AND TO_DAYS(tc.`co_create_time`) = TO_DAYS(NOW())
@@ -699,10 +697,10 @@
AND (th.hb_type =1 or th.hb_type =2)
</if>
<if test="type != null and type == 2"> <!-- 鍒嗕韩璁㈠崟 -->
- AND (th.`hb_type` = 20 OR th.`hb_type` = 21 OR th.`hb_type` = 22)
+ AND th.`hb_type` = 20
</if>
<if test="type != null and type == 3"> <!-- 閭�璇疯鍗� -->
- AND (th.`hb_type` = 5 OR th.`hb_type` = 6 OR th.`hb_type` = 7)
+ AND (th.`hb_type` = 5 OR th.`hb_type` = 6 OR th.`hb_type` = 7 OR th.`hb_type` = 21 OR th.`hb_type` = 22)
</if>
<if test="orderState != null and orderState == 1">
AND (tc.co_state = 1 or tc.co_state = 2) <!-- 鏈夋晥璁㈠崟 -->
--
Gitblit v1.8.0