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/goods/CollectionGoodsV2Mapper.xml | 13 ++++++-------
1 files changed, 6 insertions(+), 7 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/mapping/goods/CollectionGoodsV2Mapper.xml b/fanli/src/main/java/com/yeshi/fanli/mapping/goods/CollectionGoodsV2Mapper.xml
index bb3e36d..18145f2 100644
--- a/fanli/src/main/java/com/yeshi/fanli/mapping/goods/CollectionGoodsV2Mapper.xml
+++ b/fanli/src/main/java/com/yeshi/fanli/mapping/goods/CollectionGoodsV2Mapper.xml
@@ -39,10 +39,10 @@
<!-- 鏍规嵁鐢ㄦ埛ID鑾峰彇鏀惰棌璁板綍锛屾寜鐓ф敹钘忔椂闂村�掑彊 -->
<select id="selectByUidOrderByCreateTimeDesc" resultMap="BaseResultMap">
select t.* from yeshi_ec_collection_goods_v2 t
- <if test="source != null">
- LEFT JOIN `yeshi_ec_common_goods` g ON t.`cg_common_goods_id` = g.`cg_id`
- </if>
- where t.cg_uid = #{uid} <if test="source != null">AND g.`cg_goods_type` = #{source}</if>
+ LEFT JOIN `yeshi_ec_common_goods` g ON t.`cg_common_goods_id` = g.`cg_id`
+ where t.cg_uid = #{uid}
+ <if test="source != null">AND g.`cg_goods_type` = #{source}</if>
+ <if test="notBackSuVip == true"><![CDATA[AND g.`cg_goods_type` <> 4 AND g.`cg_goods_type` <> 5]]></if>
order by t.cg_createtime desc
limit #{start},#{count}
</select>
@@ -51,10 +51,9 @@
<!-- 鑾峰彇鏀惰棌鐨勬暟閲� -->
<select id="selectCountByUid" resultType="java.lang.Long" parameterType="java.lang.Long">
select count(t.cg_id) from yeshi_ec_collection_goods_v2 t
- <if test="source != null">
- LEFT JOIN `yeshi_ec_common_goods` g ON t.`cg_common_goods_id` = g.`cg_id`
- </if>
+ LEFT JOIN `yeshi_ec_common_goods` g ON t.`cg_common_goods_id` = g.`cg_id`
where t.cg_uid = #{uid} <if test="source != null">AND g.`cg_goods_type` = #{source}</if>
+ <if test="notBackSuVip == true"><![CDATA[AND g.`cg_goods_type` <> 4 AND g.`cg_goods_type` <> 5]]></if>
</select>
--
Gitblit v1.8.0