From a0a5b70e0d0df9357d09542f20dc6633a986f328 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期二, 25 六月 2019 11:06:36 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
fanli/src/main/java/com/yeshi/fanli/mapping/lable/QualityFactoryMapper.xml | 17 ++++++-----------
1 files changed, 6 insertions(+), 11 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 718e3ec..510c846 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
@@ -1341,18 +1341,13 @@
<select id="listFreeGoods" resultMap="GoodsResultMap">
- SELECT * FROM `yeshi_ec_quality_factory` h
+ 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
+ WHERE tb.`couponAmount` > 0 AND tb.`couponTotalCount` <![CDATA[>]]> 0
+ AND IF(tb.`zkPrice` - tb.`couponStartFee`<![CDATA[>=]]>0, TRUE, FALSE)
+ AND (tb.`zkPrice` - tb.`couponAmount`) <![CDATA[>]]> 0
+ AND tb.`tkRate` * (tb.`zkPrice` - tb.`couponAmount`) *0.05*0.01 <![CDATA[>]]> 1
+ ORDER BY h.sg_weight desc
LIMIT ${start},${count}
</select>
--
Gitblit v1.8.0