From 4fe5f879c1b2919099a6e193ab4db8d25725ca40 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期二, 26 二月 2019 10:16:20 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
fanli/src/main/java/com/yeshi/fanli/mapping/lable/QualityFactoryMapper.xml | 21 +++++++++++++++++++++
1 files changed, 21 insertions(+), 0 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 62f0303..5a9e34f 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
@@ -1324,5 +1324,26 @@
#{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>
+
</mapper>
--
Gitblit v1.8.0