From 3f7bcb1fb68b78a2cd2a87b44098f1de70378d92 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期一, 30 十二月 2019 18:59:59 +0800
Subject: [PATCH] 完成微信小程序登录流程

---
 fanli/src/main/java/com/yeshi/fanli/mapping/UserInfoMapper.xml |    9 ++++++---
 1 files changed, 6 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 fb97049..7def428 100644
--- a/fanli/src/main/java/com/yeshi/fanli/mapping/UserInfoMapper.xml
+++ b/fanli/src/main/java/com/yeshi/fanli/mapping/UserInfoMapper.xml
@@ -115,9 +115,9 @@
 	</delete>
 	<insert id="insert" parameterType="com.yeshi.fanli.entity.bus.user.UserInfo"
 		useGeneratedKeys="true" keyProperty="id">insert into yeshi_ec_user
-		(id,identifycode,login_type,wx_open_id,wx_union_id,nick_name,tbName,tbPic,wxName,wxPic,portrait,createtime,last_logintime,loginip,type,appid,my_hongBao,pay_password,sid,rank,phone,state,state_desc)
+		(id,identifycode,login_type,wx_open_id,wx_union_id,nick_name,tbName,tbPic,wxName,wxPic,portrait,createtime,last_logintime,loginip,type,appid,my_hongBao,pay_password,sid,rank,phone,state,state_desc,platform)
 		values
-		(#{id,jdbcType=BIGINT},#{openid,jdbcType=VARCHAR},#{loginType,jdbcType=INTEGER},#{wxOpenId,jdbcType=VARCHAR},#{wxUnionId,jdbcType=VARCHAR},#{nickName,jdbcType=VARCHAR},#{tbName,jdbcType=VARCHAR},#{tbPic,jdbcType=VARCHAR},#{wxName,jdbcType=VARCHAR},#{wxPic,jdbcType=VARCHAR},#{portrait,jdbcType=VARCHAR},#{createtime,jdbcType=BIGINT},#{lastLoginTime,jdbcType=BIGINT},#{lastLoginIp,jdbcType=VARCHAR},#{type,jdbcType=INTEGER},#{appId,jdbcType=VARCHAR},#{myHongBao,jdbcType=DECIMAL},#{payPassword,jdbcType=VARCHAR},#{system.id,jdbcType=BIGINT},#{rank,jdbcType=INTEGER},#{phone,jdbcType=VARCHAR},#{state,jdbcType=INTEGER},#{stateDesc,jdbcType=VARCHAR})
+		(#{id,jdbcType=BIGINT},#{openid,jdbcType=VARCHAR},#{loginType,jdbcType=INTEGER},#{wxOpenId,jdbcType=VARCHAR},#{wxUnionId,jdbcType=VARCHAR},#{nickName,jdbcType=VARCHAR},#{tbName,jdbcType=VARCHAR},#{tbPic,jdbcType=VARCHAR},#{wxName,jdbcType=VARCHAR},#{wxPic,jdbcType=VARCHAR},#{portrait,jdbcType=VARCHAR},#{createtime,jdbcType=BIGINT},#{lastLoginTime,jdbcType=BIGINT},#{lastLoginIp,jdbcType=VARCHAR},#{type,jdbcType=INTEGER},#{appId,jdbcType=VARCHAR},#{myHongBao,jdbcType=DECIMAL},#{payPassword,jdbcType=VARCHAR},#{system.id,jdbcType=BIGINT},#{rank,jdbcType=INTEGER},#{phone,jdbcType=VARCHAR},#{state,jdbcType=INTEGER},#{stateDesc,jdbcType=VARCHAR},#{platform,jdbcType=VARCHAR})
 	</insert>
 	<insert id="insertSelective" parameterType="com.yeshi.fanli.entity.bus.user.UserInfo"
 		useGeneratedKeys="true" keyProperty="id">
@@ -146,6 +146,7 @@
 			<if test="phone != null">phone,</if>
 			<if test="state != null">state,</if>
 			<if test="stateDesc != null">state_desc,</if>
+			<if test="platform != null">platform,</if>
 		</trim>
 		values
 		<trim prefix="(" suffix=")" suffixOverrides=",">
@@ -172,6 +173,7 @@
 			<if test="phone != null">#{phone,jdbcType=VARCHAR},</if>
 			<if test="state != null">#{state,jdbcType=INTEGER},</if>
 			<if test="stateDesc != null">#{stateDesc,jdbcType=VARCHAR}</if>
+			<if test="platform != null">#{platform,jdbcType=VARCHAR}</if>
 		</trim>
 	</insert>
 	<update id="updateByPrimaryKey" parameterType="com.yeshi.fanli.entity.bus.user.UserInfo">update
@@ -742,7 +744,8 @@
 		LEFT JOIN `yeshi_ec_user` u ON u.`id` = t.`uie_uid`
 		WHERE <![CDATA[ t.uie_active_time < '2019-06-19']]>
 		AND (t.`uie_mark` IS NULL OR t.`uie_mark` = '')
-		AND u.`state` = 0 AND u.`my_hongBao`<![CDATA[> 1]]>
+		AND u.`state` = 0 AND
+		u.`my_hongBao`<![CDATA[> 1]]>
 		AND u.`wx_open_id` IS NOT NULL AND <![CDATA[LENGTH(TRIM(u.`wx_open_id`)) > 0]]>
 		AND u.`wx_open_id` NOT LIKE 'o_b9%'
 		LIMIT #{start},#{count}

--
Gitblit v1.8.0