From 28cf328a098334b51a3e9d2d56f983fb8c862211 Mon Sep 17 00:00:00 2001
From: yujian <yujian@163.com>
Date: 星期六, 23 五月 2020 09:54:38 +0800
Subject: [PATCH] 足迹、收藏订单兼容新需求
---
fanli/src/main/java/com/yeshi/fanli/mapping/order/CommonOrderMapper.xml | 8 ++++++++
1 files changed, 8 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 bde244e..f627964 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
@@ -464,6 +464,7 @@
<foreach collection="listSource" item="item" open="AND ("
close=")" separator="or">co.co_source_type = #{item}</foreach>
</if>
+ <![CDATA[AND co.co_source_type <> 4 AND co.co_source_type <> 5]]>
GROUP BY co.`co_order_no`, co.`co_source_type` ORDER BY
co.co_third_create_time DESC LIMIT ${start},${count}
</select>
@@ -500,6 +501,7 @@
<foreach collection="listSource" item="item" open="AND ("
close=")" separator="or">co.co_source_type = #{item}</foreach>
</if>
+ <![CDATA[AND co.co_source_type <> 4 AND co.co_source_type <> 5]]>
GROUP BY co.`co_order_no`, co.`co_source_type` )A
</select>
<select id="listOrderGoodsInfo" resultMap="ResultMap"
@@ -1163,6 +1165,9 @@
<foreach collection="listSource" item="item" open="AND ("
close=")" separator="or">co.co_source_type = #{item}</foreach>
</if>
+ <if test="notBackSuVip == true">
+ <![CDATA[AND co.co_source_type <> 4 AND co.co_source_type <> 5]]>
+ </if>
GROUP BY co.`co_order_no`, co.`co_source_type` ORDER BY
co.co_third_create_time DESC LIMIT ${start},${count}
</select>
@@ -1198,6 +1203,9 @@
<foreach collection="listSource" item="item" open="AND ("
close=")" separator="or">co.co_source_type = #{item}</foreach>
</if>
+ <if test="notBackSuVip == true">
+ <![CDATA[AND co.co_source_type <> 4 AND co.co_source_type <> 5]]>
+ </if>
GROUP BY co.`co_order_no`, co.`co_source_type` )A
</select>
<select id="countOrderByUidAndSettled" resultType="Long">SELECT
--
Gitblit v1.8.0