From 7ba5c2575d8c13ce53d5d562fe7f6b649e7778b5 Mon Sep 17 00:00:00 2001
From: Administrator <Administrator@Admin>
Date: 星期三, 14 十一月 2018 17:55:58 +0800
Subject: [PATCH] Merge branch 'dev1'
---
fanli/src/main/java/com/yeshi/fanli/mapping/lable/QualityFactoryMapper.xml | 14 ++++++++++++++
1 files changed, 14 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 835d00e..a050831 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
@@ -1077,6 +1077,13 @@
<if test='endprice != null'>
AND <![CDATA[ tb.`zkPrice` <= #{endprice}]]>
</if>
+ <!-- 杩斿埄姣旇寖鍥� -->
+ <if test='startTkRate != null'>
+ AND <![CDATA[ tb.`tkRate` >= #{startTkRate}]]>
+ </if>
+ <if test='endTkRate != null'>
+ AND <![CDATA[ tb.`tkRate` <= #{endTkRate}]]>
+ </if>
<!-- 鏈夊埜 -->
<if test='hasQuan != null'>
AND <![CDATA[ tb.`couponLeftCount` > 1]]>
@@ -1130,6 +1137,13 @@
<if test='endprice != null'>
AND <![CDATA[ tb.`zkPrice` <= #{endprice}]]>
</if>
+ <!-- 杩斿埄姣旇寖鍥� -->
+ <if test='startTkRate != null'>
+ AND <![CDATA[ tb.`tkRate` >= #{startTkRate}]]>
+ </if>
+ <if test='endTkRate != null'>
+ AND <![CDATA[ tb.`tkRate` <= #{endTkRate}]]>
+ </if>
<!-- 鏈夊埜 -->
<if test='hasQuan != null'>
AND <![CDATA[ tb.`couponLeftCount` > 1]]>
--
Gitblit v1.8.0