From 03bba97b110a4c7f43fd24c9dd6806d312774efe Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期五, 31 五月 2019 10:31:52 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
fanli/src/main/java/com/yeshi/fanli/mapping/lable/QualityFactoryMapper.xml | 57 +++++++++++++++++++++++++++++++++++----------------------
1 files changed, 35 insertions(+), 22 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/mapping/lable/QualityFactoryMapper.xml b/fanli/src/main/java/com/yeshi/fanli/mapping/lable/QualityFactoryMapper.xml
index 33b5915..ca4ff68 100644
--- a/fanli/src/main/java/com/yeshi/fanli/mapping/lable/QualityFactoryMapper.xml
+++ b/fanli/src/main/java/com/yeshi/fanli/mapping/lable/QualityFactoryMapper.xml
@@ -1266,26 +1266,6 @@
#{start},#{count}
</select>
- <select id="listFreeGoods" resultMap="GoodsResultMap">
- SELECT * FROM `yeshi_ec_quality_factory` f
- LEFT JOIN `yeshi_ec_taobao_goods` tg ON tg.`id` = f.`sg_goods_id`
- LEFT JOIN `yeshi_ec_label_goods` g ON g.`lg_goods_id` = f.`sg_goods_id`
- LEFT JOIN `yeshi_ec_label` lab ON lab.`lab_id` = g.`lg_label_id`
- WHERE lab.`lab_title` = #{lableName}
- <![CDATA[AND tg.`tkRate` >= #{tkRate}]]>
- ORDER BY f.`sg_createtime` DESC
- limit #{start},#{count}
- </select>
-
-
- <select id="countFreeGoods" resultType="java.lang.Long">
- SELECT ifnull(count(sg_id),0) FROM `yeshi_ec_quality_factory` f
- LEFT JOIN `yeshi_ec_taobao_goods` tg ON tg.`id` = f.`sg_goods_id`
- LEFT JOIN `yeshi_ec_label_goods` g ON g.`lg_goods_id` = f.`sg_goods_id`
- LEFT JOIN `yeshi_ec_label` lab ON lab.`lab_id` = g.`lg_label_id`
- WHERE lab.`lab_title` = #{lableName}
- <![CDATA[AND tg.`tkRate` >= #{tkRate}]]>
- </select>
<select id="listByShopId" resultMap="GoodsResultMap">
SELECT * FROM yeshi_ec_quality_factory q
@@ -1320,7 +1300,7 @@
</select>
<select id="count9k9ClassGoods" resultType="java.lang.Long">
- SELECT IFNULL(COUNT( h.`sg_id`),0) FROM `yeshi_ec_quality_factory` h
+ SELECT IFNULL(COUNT(h.`sg_id`),0) FROM `yeshi_ec_quality_factory` h
LEFT JOIN yeshi_ec_taobao_goods tb ON h.`sg_goods_id`= tb.`id`
WHERE tb.`couponAmount` > 0 AND tb.`couponTotalCount` > 0
AND IF(tb.`zkPrice` - tb.`couponStartFee`>=0, TRUE, FALSE)
@@ -1350,7 +1330,7 @@
</select>
<select id="countQueryEverydayRob" resultType="java.lang.Long">
- SELECT IFNULL(COUNT( h.`sg_id`),0) FROM `yeshi_ec_quality_factory` h
+ SELECT IFNULL(COUNT(h.`sg_id`),0) FROM `yeshi_ec_quality_factory` h
LEFT JOIN yeshi_ec_taobao_goods tb ON h.`sg_goods_id`= tb.`id`
WHERE tb.`couponTotalCount` > 0 AND tb.couponAmount <![CDATA[>]]> 1 AND tb.couponAmount <![CDATA[<=]]> 50
AND IF(tb.`zkPrice` - tb.`couponStartFee`>=0, TRUE, FALSE)
@@ -1359,4 +1339,37 @@
AND (tb.`zkPrice` - tb.`couponAmount`) <![CDATA[<=]]> #{maxQuanPrice}
</select>
+
+ <select id="listFreeGoods" resultMap="GoodsResultMap">
+ SELECT * FROM `yeshi_ec_quality_factory` h
+ LEFT JOIN yeshi_ec_taobao_goods tb ON h.`sg_goods_id`= tb.`id`
+ WHERE tb.`couponAmount` > 0 AND tb.`couponTotalCount` > 0
+ AND IF(tb.`zkPrice` - tb.`couponStartFee`>=0, TRUE, FALSE)
+ <!-- 鍦ㄥ敭浠� 209.9 -->
+ AND tb.`zkPrice` <![CDATA[<=]]> 209.9
+ <!-- 鍒稿悗浠疯寖鍥� 0~9.9 -->
+ AND (tb.`zkPrice` - tb.`couponAmount`) <![CDATA[>]]> 0
+ AND (tb.`zkPrice` - tb.`couponAmount`) <![CDATA[<= ]]> 9.9
+ <!-- 姣斾緥 20 -->
+ AND tb.`tkRate` <![CDATA[>=]]> 20
+ ORDER BY h.sg_weight desc
+ LIMIT ${start},${count}
+ </select>
+
+
+ <select id="countFreeGoods" resultType="java.lang.Long">
+ SELECT IFNULL(COUNT(h.`sg_id`),0) FROM `yeshi_ec_quality_factory` h
+ LEFT JOIN yeshi_ec_taobao_goods tb ON h.`sg_goods_id`= tb.`id`
+ WHERE tb.`couponAmount` > 0 AND tb.`couponTotalCount` > 0
+ AND IF(tb.`zkPrice` - tb.`couponStartFee`>=0, TRUE, FALSE)
+ <!-- 鍦ㄥ敭浠� 209.9 -->
+ AND tb.`zkPrice` <![CDATA[<=]]> 209.9
+ <!-- 鍒稿悗浠疯寖鍥� 0~9.9 -->
+ AND (tb.`zkPrice` - tb.`couponAmount`) <![CDATA[>]]> 0
+ AND (tb.`zkPrice` - tb.`couponAmount`) <![CDATA[<= ]]> 9.9
+ <!-- 姣斾緥 20 -->
+ AND tb.`tkRate` <![CDATA[>=]]> 20
+ </select>
+
+
</mapper>
--
Gitblit v1.8.0