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/ScanHistoryV2Mapper.xml | 6 ++----
1 files changed, 2 insertions(+), 4 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/mapping/goods/ScanHistoryV2Mapper.xml b/fanli/src/main/java/com/yeshi/fanli/mapping/goods/ScanHistoryV2Mapper.xml
index 5116da2..f45490b 100644
--- a/fanli/src/main/java/com/yeshi/fanli/mapping/goods/ScanHistoryV2Mapper.xml
+++ b/fanli/src/main/java/com/yeshi/fanli/mapping/goods/ScanHistoryV2Mapper.xml
@@ -32,15 +32,14 @@
SELECT * FROM (
SELECT SUBSTRING_INDEX(GROUP_CONCAT(s.s_id ORDER BY s.s_createtime DESC), ',', 1)AS hid
FROM yeshi_ec_scanhistory_v2 s
- <if test="source != null">
LEFT JOIN `yeshi_ec_common_goods` g ON s.`s_common_goods_id` = g.`cg_id`
- </if>
WHERE
<trim prefix="(" suffix=")" suffixOverrides="or">
<if test="uid != null"> s.`s_uid`=#{uid,jdbcType=BIGINT} or</if>
<if test="device != null">s.`s_device`=#{device,jdbcType=VARCHAR} or</if>
</trim>
<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>
GROUP BY s.s_common_goods_id
)A
LEFT JOIN yeshi_ec_scanhistory_v2 B ON B.s_id = A.hid
@@ -51,15 +50,14 @@
<!-- 鏍规嵁UID鎴栬�呰澶囧彿鑾峰彇娴忚璁板綍鏉℃暟 -->
<select id="selectCountByDeviceOrUid" resultType="java.lang.Long">
SELECT IFNULL(COUNT(DISTINCT s.`s_common_goods_id`),0) FROM yeshi_ec_scanhistory_v2 s
- <if test="source != null">
LEFT JOIN `yeshi_ec_common_goods` g ON s.`s_common_goods_id` = g.`cg_id`
- </if>
WHERE
<trim prefix="(" suffix=")" suffixOverrides="or">
<if test="uid != null"> s.`s_uid`=#{uid,jdbcType=BIGINT} or</if>
<if test="device != null">s.`s_device`=#{device,jdbcType=VARCHAR} or</if>
</trim>
<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