From d1b7fd85615a78a476650e5acfc8b165a5deb3aa Mon Sep 17 00:00:00 2001
From: yujian <yujian>
Date: 星期五, 12 四月 2019 11:41:05 +0800
Subject: [PATCH] Merge branch 'div'

---
 fanli/src/main/java/com/yeshi/fanli/mapping/UserInfoMapper.xml |   15 +++++++++++++++
 1 files changed, 15 insertions(+), 0 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 4debba4..20aae7c 100644
--- a/fanli/src/main/java/com/yeshi/fanli/mapping/UserInfoMapper.xml
+++ b/fanli/src/main/java/com/yeshi/fanli/mapping/UserInfoMapper.xml
@@ -244,6 +244,21 @@
 		<include refid="Base_Column_List" />
 		from yeshi_ec_user where appid=#{appId} and phone=#{phone} 
 	</select>
+	
+	<!-- 鏍规嵁AppId涓庣數璇濆彿鐮佽幏鍙栫敤鎴� -->
+	<select id="getEffectiveUserInfoByPhone" resultMap="BaseResultMap">
+		select <include refid="Base_Column_List" /> from yeshi_ec_user 
+		where phone=#{phone} AND state = 0 
+		LIMIT 1 
+	</select>
+	
+	<!-- 鏍规嵁AppId涓庣數璇濆彿鐮佽幏鍙栫敤鎴� -->
+	<select id="getEffectiveUserInfoByWXUnionId" resultMap="BaseResultMap">
+		select <include refid="Base_Column_List" /> from yeshi_ec_user 
+		where wx_union_id=#{unionId} AND state = 0 
+		LIMIT 1 
+	</select>
+	
 	<select id="getMaxUid" resultType="java.lang.Long">select max(id) from
 		yeshi_ec_user
 	</select>

--
Gitblit v1.8.0