From a18310725c451260bd93090d47978968c5bd5f65 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期六, 19 十月 2019 18:20:29 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into div

---
 fanli/src/main/java/com/yeshi/fanli/mapping/UserInfoMapper.xml |    7 ++++---
 1 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/fanli/src/main/java/com/yeshi/fanli/mapping/UserInfoMapper.xml b/fanli/src/main/java/com/yeshi/fanli/mapping/UserInfoMapper.xml
index f1b984e..3dcf266 100644
--- a/fanli/src/main/java/com/yeshi/fanli/mapping/UserInfoMapper.xml
+++ b/fanli/src/main/java/com/yeshi/fanli/mapping/UserInfoMapper.xml
@@ -701,11 +701,12 @@
 		where u.state=0
 	</select>
 	
-	<select id="getAutoExtractUserIds" resultMap="BaseResultMap">
+	<select id="getAutoExtractUser" resultMap="BaseResultMap">
 		SELECT u.* FROM `yeshi_ec_user_info_extra` t
 		LEFT JOIN  `yeshi_ec_user` u ON u.`id` = t.`uie_uid`
-		WHERE t.`uie_auto_extract` = 1 AND u.`state` = 0 AND u.`my_hongBao` <![CDATA[>=]]> #{money} 
-		AND u.`wx_open_id` IS NOT NULL AND LENGTH(TRIM(u.`wx_open_id`)) <![CDATA[>]]> 0
+		WHERE t.`uie_auto_extract` = 1 AND t.uie_active_time <![CDATA[>=]]> #{beganDate} AND  t.uie_active_time <![CDATA[<]]> #{endDate}
+			AND u.`state` = 0 AND u.`my_hongBao` <![CDATA[>=]]> #{money} 
+			AND u.`wx_open_id` IS NOT NULL AND LENGTH(TRIM(u.`wx_open_id`)) <![CDATA[>]]> 0
 		LIMIT #{start},#{count}
 	</select>
 

--
Gitblit v1.8.0