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/user/UserInfoExtraMapper.xml |   29 ++++++++++++++++++++++++++++-
 1 files changed, 28 insertions(+), 1 deletions(-)

diff --git a/fanli/src/main/java/com/yeshi/fanli/mapping/user/UserInfoExtraMapper.xml b/fanli/src/main/java/com/yeshi/fanli/mapping/user/UserInfoExtraMapper.xml
index f9c1268..f343932 100644
--- a/fanli/src/main/java/com/yeshi/fanli/mapping/user/UserInfoExtraMapper.xml
+++ b/fanli/src/main/java/com/yeshi/fanli/mapping/user/UserInfoExtraMapper.xml
@@ -45,6 +45,29 @@
 	  	
   </resultMap>
   
+  <resultMap id="AllResultMap" type="com.yeshi.fanli.entity.bus.user.UserInfoExtra">
+  <id column="uie_id" property="id" jdbcType="BIGINT"/>
+    <result column="uie_rank_source" property="rankSource" jdbcType="INTEGER"/>
+    <result column="uie_rank_order_num" property="rankOrderNum" jdbcType="INTEGER"/>
+    <result column="uie_rank_update_time" property="rankUpdateTime" jdbcType="TIMESTAMP"/>
+    <result column="uie_invite_code" property="inviteCode" jdbcType="VARCHAR"/>
+    <result column="uie_lottery_newbies" property="lotteryNewbies" jdbcType="INTEGER"/>
+    <result column="uie_coupon_news" property="couponNews" jdbcType="INTEGER"/>
+    <result column="uie_synch_navbar" property="synchNavbar" jdbcType="VARCHAR"/>
+    <result column="uie_first_login_time" property="firstLoginTime" jdbcType="TIMESTAMP"/>
+    <result column="uie_create_time" property="createTime" jdbcType="TIMESTAMP"/>
+    <result column="uie_update_time" property="updateTime" jdbcType="TIMESTAMP"/>
+    
+    <association property="userInfo" column="uie_uid" javaType="com.yeshi.fanli.entity.bus.user.UserInfo">
+		<id column="uie_uid" property="id" jdbcType="BIGINT" />
+	</association>
+	
+	<association property="userRank" column="uie_rank_id" 
+	 	resultMap="com.yeshi.fanli.dao.mybatis.user.UserRankMapper.BaseResultMap"/>
+  </resultMap>
+  
+  
+  
   <sql id="Base_Column_List">uie_id,uie_uid,uie_rank_id,uie_rank_source,uie_rank_order_num,uie_rank_update_time,uie_invite_code,uie_lottery_newbies,uie_coupon_news,uie_synch_navbar,uie_first_login_time,uie_create_time,uie_update_time</sql>
  
   <select id="selectByPrimaryKey" resultMap="BaseResultMap" parameterType="java.lang.Long">select
@@ -140,5 +163,9 @@
 		WHERE  t.`uie_rank_id` = #{rankId}
    </select>
 	
- 
+   <select id="gerUserRank" resultMap="AllResultMap">
+		SELECT * FROM yeshi_ec_user_info_extra ue
+		LEFT JOIN yeshi_ec_user_rank rk ON rk.`ur_id` = ue.`uie_rank_id`
+		WHERE ue.`uie_uid` = #{uid}
+   </select>
 </mapper>

--
Gitblit v1.8.0