From 085d0e9e62e524b7cf0e7b7d8ad3b51a5a7c1e81 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期三, 24 七月 2024 11:01:09 +0800
Subject: [PATCH] Merge branch '2.0' of http://120.76.84.145:10101/gitblit/r/java/IgoTravel into 2.0
---
UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/UserInfoMapper.xml | 72 ++++++++++++++++++++++++++++++++----
1 files changed, 64 insertions(+), 8 deletions(-)
diff --git a/UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/UserInfoMapper.xml b/UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/UserInfoMapper.xml
index 9fa6a83..035e8c7 100644
--- a/UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/UserInfoMapper.xml
+++ b/UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/UserInfoMapper.xml
@@ -9,6 +9,7 @@
<result column="registIp" property="registIp"/>
<result column="registAreaCode" property="registAreaCode"/>
<result column="phone" property="phone"/>
+ <result column="email" property="email"/>
<result column="nickName" property="nickName"/>
<result column="avatar" property="avatar"/>
<result column="birthday" property="birthday"/>
@@ -16,7 +17,8 @@
<result column="emergencyContact" property="emergencyContact"/>
<result column="emergencyContactNumber" property="emergencyContactNumber"/>
<result column="isAuth" property="isAuth"/>
- <result column="name" property="name"/>
+ <result column="lastName" property="lastName"/>
+ <result column="firstName" property="firstName"/>
<result column="idCard" property="idCard"/>
<result column="idCardFront" property="idCardFront"/>
<result column="idCardReverse" property="idCardReverse"/>
@@ -24,6 +26,7 @@
<result column="balance" property="balance"/>
<result column="integral" property="integral"/>
<result column="passWord" property="passWord"/>
+ <result column="faceBookId" property="faceBookId"/>
<result column="openId" property="openId"/>
<result column="appletsOpenId" property="appletsOpenId"/>
<result column="unionid" property="unionid"/>
@@ -36,6 +39,7 @@
<result column="updateUser" property="updateUser"/>
<result column="uid" property="uid"/>
<result column="uType" property="uType"/>
+ <result column="language" property="language"/>
</resultMap>
<select id="queryFreeMOney" resultType="Double">
@@ -47,15 +51,18 @@
id as id,
registIp as registIp,
registAreaCode as registAreaCode,
+ phoneOperator as phoneOperator,
phone as phone,
nickName as nickName,
avatar as avatar,
birthday as birthday,
sex as sex,
+ email,
emergencyContact as emergencyContact,
emergencyContactNumber as emergencyContactNumber,
isAuth as isAuth,
- name as name,
+ lastName as lastName,
+ firstName as firstName,
idCard as idCard,
idCardFront as idCardFront,
idCardReverse as idCardReverse,
@@ -76,21 +83,61 @@
</select>
+ <select id="queryByEmail" resultType="UserInfo">
+ select
+ id as id,
+ registIp as registIp,
+ registAreaCode as registAreaCode,
+ phoneOperator as phoneOperator,
+ phone as phone,
+ nickName as nickName,
+ avatar as avatar,
+ birthday as birthday,
+ sex as sex,
+ email,
+ emergencyContact as emergencyContact,
+ emergencyContactNumber as emergencyContactNumber,
+ isAuth as isAuth,
+ lastName as lastName,
+ firstName as firstName,
+ idCard as idCard,
+ idCardFront as idCardFront,
+ idCardReverse as idCardReverse,
+ consumption as consumption,
+ balance as balance,
+ integral as integral,
+ passWord as passWord,
+ openId as openId,
+ appletsOpenId as appletsOpenId,
+ unionid as unionid,
+ state as state,
+ flag as flag,
+ insertTime as insertTime,
+ insertUser as insertUser,
+ updateTime as updateTime,
+ updateUser as updateUser
+ from t_user where flag != 3 and email = #{email}
+ </select>
+
+
<select id="queryByOpenid" resultType="UserInfo">
select
id as id,
registIp as registIp,
registAreaCode as registAreaCode,
+ phoneOperator as phoneOperator,
phone as phone,
nickName as nickName,
avatar as avatar,
birthday as birthday,
sex as sex,
+ email,
emergencyContact as emergencyContact,
emergencyContactNumber as emergencyContactNumber,
isAuth as isAuth,
- name as name,
+ lastName as lastName,
+ firstName as firstName,
idCard as idCard,
idCardFront as idCardFront,
idCardReverse as idCardReverse,
@@ -119,15 +166,18 @@
id as id,
registIp as registIp,
registAreaCode as registAreaCode,
+ phoneOperator as phoneOperator,
phone as phone,
nickName as nickName,
avatar as avatar,
birthday as birthday,
sex as sex,
+ email,
emergencyContact as emergencyContact,
emergencyContactNumber as emergencyContactNumber,
isAuth as isAuth,
- name as name,
+ lastName as lastName,
+ firstName as firstName,
idCard as idCard,
idCardFront as idCardFront,
idCardReverse as idCardReverse,
@@ -154,18 +204,22 @@
<select id="queryUserInfo" resultType="map">
select
a.id as id,
+ a.phoneOperator as phoneOperator,
a.phone as phone,
+ a.email as email,
+ a.lastName as lastName,
+ a.firstName as firstName,
a.nickName as nickName,
a.avatar as avatar,
DATE_FORMAT(a.birthday, '%Y-%m-%d') as birthday,
a.sex as sex,
a.isAuth as isAuth,
(select state from t_verified where userId = a.id order by insertTime desc limit 0,1) as verified,
- a.name as name,
a.integral as integral,
a.emergencyContact as emergencyContact,
a.emergencyContactNumber as emergencyContactNumber,
- a.balance as balance
+ a.balance as balance,
+ a.language
from t_user a where 1 = 1
<if test="null != uid">
and a.id = #{uid}
@@ -185,7 +239,8 @@
select
id as id,
userId as userId,
- name as name,
+ lastName as lastName,
+ firstName as firstName,
idcode as idcode,
img1 as img1,
img2 as img2,
@@ -196,8 +251,9 @@
<select id="queryMyInviteUserList" resultType="map">
select
id as id,
+ phoneOperator as phoneOperator,
phone as phone,
- IFNULL(name,nickName) as name,
+ IFNULL(lastName,nickName) as name,
avatar as avatar,
DATE_FORMAT(insertTime,'%Y/%m/%d %H:%i') as insertTime
from t_user
--
Gitblit v1.7.1