From c389b1ca090df256bad7fd0d183914146c1f93b8 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期五, 12 四月 2019 12:15:06 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 fanli/src/main/java/com/yeshi/fanli/mapping/user/UserExtraTaoBaoInfoMapper.xml |  211 +++++++++++++++++++++-------------------------------
 1 files changed, 84 insertions(+), 127 deletions(-)

diff --git a/fanli/src/main/java/com/yeshi/fanli/mapping/user/UserExtraTaoBaoInfoMapper.xml b/fanli/src/main/java/com/yeshi/fanli/mapping/user/UserExtraTaoBaoInfoMapper.xml
index 987f667..d4ace14 100644
--- a/fanli/src/main/java/com/yeshi/fanli/mapping/user/UserExtraTaoBaoInfoMapper.xml
+++ b/fanli/src/main/java/com/yeshi/fanli/mapping/user/UserExtraTaoBaoInfoMapper.xml
@@ -2,46 +2,31 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 
 <mapper namespace="com.yeshi.fanli.dao.mybatis.user.UserExtraTaoBaoInfoMapper">
-	<resultMap id="BaseResultMap"
-		type="com.yeshi.fanli.entity.bus.user.UserExtraTaoBaoInfo">
-		<id column="uiet_id" property="id" jdbcType="BIGINT" />
-		<result column="uiet_relation_id" property="relationId"
-			jdbcType="VARCHAR" />
-		<result column="uiet_relation_update_time" property="relationUpdateTime"
-			jdbcType="TIMESTAMP" />
-		<result column="uiet_special_id" property="specialId" jdbcType="VARCHAR" />
-		<result column="uiet_special_update_time" property="specialUpdateTime"
-			jdbcType="TIMESTAMP" />
-		<result column="uiet_create_time" property="createTime"
-			jdbcType="TIMESTAMP" />
-		<result column="uiet_update_time" property="updateTime"
-			jdbcType="TIMESTAMP" />
-		<result column="uiet_relation_valid" property="relationValid"
-			jdbcType="BOOLEAN" />
-		<result column="uiet_special_valid" property="specialValid"
-			jdbcType="BOOLEAN" />
-		<result column="uiet_taobao_uid" property="taoBaoUid" jdbcType="VARCHAR" />
-
-		<result column="uiet_taobao_order_end_6_num" property="taoBaoOrderEnd6Num"
-			jdbcType="VARCHAR" />
-
-		<association property="user" column="uiet_uid"
+  <resultMap id="BaseResultMap" type="com.yeshi.fanli.entity.bus.user.UserExtraTaoBaoInfo">
+    <id column="uiet_id" property="id" jdbcType="BIGINT"/>
+    <result column="uiet_relation_id" property="relationId" jdbcType="VARCHAR"/>
+    <result column="uiet_relation_valid" property="relationValid" jdbcType="BOOLEAN"/>
+    <result column="uiet_relation_update_time" property="relationUpdateTime" jdbcType="TIMESTAMP"/>
+    <result column="uiet_special_id" property="specialId" jdbcType="VARCHAR"/>
+    <result column="uiet_special_valid" property="specialValid" jdbcType="BOOLEAN"/>
+    <result column="uiet_special_update_time" property="specialUpdateTime" jdbcType="TIMESTAMP"/>
+    <result column="uiet_taobao_uid" property="taoBaoUid" jdbcType="VARCHAR"/>
+    <result column="uiet_taobao_order_end_6_num" property="taoBaoOrderEnd6Num" jdbcType="VARCHAR"/>
+    <result column="uiet_taobao_nick_name" property="taoBaoNickName" jdbcType="VARCHAR"/>
+    <result column="uiet_create_time" property="createTime" jdbcType="TIMESTAMP"/>
+    <result column="uiet_update_time" property="updateTime" jdbcType="TIMESTAMP"/>
+	
+	<association property="user" column="uiet_uid"
 			javaType="com.yeshi.fanli.entity.bus.user.UserInfo">
 			<id column="uiet_uid" property="id" />
 		</association>
-
-	</resultMap>
-	<sql id="Base_Column_List">uiet_id,uiet_uid,uiet_relation_id,uiet_relation_update_time,uiet_special_id,uiet_special_update_time,uiet_create_time,uiet_update_time,uiet_relation_valid,uiet_special_valid,uiet_taobao_uid,uiet_taobao_order_end_6_num
-	</sql>
-	<select id="selectByPrimaryKey" resultMap="BaseResultMap"
-		parameterType="java.lang.Long">
-		select
-		<include refid="Base_Column_List" />
-		from yeshi_ec_user_info_extra_taobao where uiet_id =
-		#{id,jdbcType=BIGINT}
-	</select>
-
-
+		
+  </resultMap>
+  <sql id="Base_Column_List">uiet_id,uiet_uid,uiet_relation_id,uiet_relation_valid,uiet_relation_update_time,uiet_special_id,uiet_special_valid,uiet_special_update_time,uiet_taobao_uid,uiet_taobao_order_end_6_num,uiet_taobao_nick_name,uiet_create_time,uiet_update_time</sql>
+  <select id="selectByPrimaryKey" resultMap="BaseResultMap" parameterType="java.lang.Long">select
+    <include refid="Base_Column_List"/>from yeshi_ec_user_info_extra_taobao where uiet_id = #{id,jdbcType=BIGINT}
+  </select>
+  
 	<select id="selectByUid" resultMap="BaseResultMap"
 		parameterType="java.lang.Long">
 		select
@@ -57,6 +42,11 @@
 		from yeshi_ec_user_info_extra_taobao where uiet_taobao_uid =
 		#{0} limit
 		1
+	</select>
+	
+	<select id="listByTaoBaoUid" resultMap="BaseResultMap" parameterType="java.lang.String">
+		SELECT * FROM yeshi_ec_user_info_extra_taobao tb
+		WHERE  tb.`uiet_taobao_uid` = #{0} AND tb.`uiet_uid` IS NOT NULL 
 	</select>
 
 
@@ -79,94 +69,61 @@
 		#{0} and
 		uiet_uid is not null limit 1
 	</select>
-
-	<delete id="deleteByPrimaryKey" parameterType="java.lang.Long">delete from
-		yeshi_ec_user_info_extra_taobao where uiet_id = #{id,jdbcType=BIGINT}
-	</delete>
-	<insert id="insert" parameterType="com.yeshi.fanli.entity.bus.user.UserExtraTaoBaoInfo"
-		useGeneratedKeys="true" keyProperty="id">insert into
-		yeshi_ec_user_info_extra_taobao
-		(uiet_id,uiet_uid,uiet_relation_id,uiet_relation_update_time,uiet_special_id,uiet_special_update_time,uiet_create_time,uiet_update_time,uiet_relation_valid,uiet_special_valid,uiet_taobao_uid,uiet_taobao_order_end_6_num)
-		values
-		(#{id,jdbcType=BIGINT},#{user.id,jdbcType=BIGINT},#{relationId,jdbcType=VARCHAR},#{relationUpdateTime,jdbcType=TIMESTAMP},#{specialId,jdbcType=VARCHAR},#{specialUpdateTime,jdbcType=TIMESTAMP},#{createTime,jdbcType=TIMESTAMP},#{updateTime,jdbcType=TIMESTAMP},#{relationValid,jdbcType=BOOLEAN},#{specialValid,jdbcType=BOOLEAN},#{taoBaoUid,jdbcType=VARCHAR},#{taoBaoOrderEnd6Num,jdbcType=VARCHAR})
-	</insert>
-	<insert id="insertSelective" parameterType="com.yeshi.fanli.entity.bus.user.UserExtraTaoBaoInfo"
-		useGeneratedKeys="true" keyProperty="id">
-		insert into yeshi_ec_user_info_extra_taobao
-		<trim prefix="(" suffix=")" suffixOverrides=",">
-			<if test="id != null">uiet_id,</if>
-			<if test="user != null">uiet_uid,</if>
-			<if test="relationId != null">uiet_relation_id,</if>
-			<if test="relationUpdateTime != null">uiet_relation_update_time,</if>
-			<if test="specialId != null">uiet_special_id,</if>
-			<if test="specialUpdateTime != null">uiet_special_update_time,</if>
-			<if test="createTime != null">uiet_create_time,</if>
-			<if test="updateTime != null">uiet_update_time,</if>
-			<if test="relationValid != null">uiet_relation_valid,</if>
-			<if test="specialValid != null">uiet_special_valid,</if>
-			<if test="taoBaoUid != null">uiet_taobao_uid,</if>
-			<if test="taoBaoOrderEnd6Num != null">uiet_taobao_order_end_6_num,</if>
-		</trim>
-		values
-		<trim prefix="(" suffix=")" suffixOverrides=",">
-			<if test="id != null">#{id,jdbcType=BIGINT},</if>
-			<if test="user != null">#{user.id,jdbcType=BIGINT},</if>
-			<if test="relationId != null">#{relationId,jdbcType=VARCHAR},</if>
-			<if test="relationUpdateTime != null">#{relationUpdateTime,jdbcType=TIMESTAMP},</if>
-			<if test="specialId != null">#{specialId,jdbcType=VARCHAR},</if>
-			<if test="specialUpdateTime != null">#{specialUpdateTime,jdbcType=TIMESTAMP},</if>
-			<if test="createTime != null">#{createTime,jdbcType=TIMESTAMP},</if>
-			<if test="updateTime != null">#{updateTime,jdbcType=TIMESTAMP},</if>
-			<if test="relationValid != null">#{relationValid,jdbcType=BOOLEAN},</if>
-			<if test="specialValid != null">#{specialValid,jdbcType=BOOLEAN},</if>
-			<if test="taoBaoUid != null">#{taoBaoUid,jdbcType=VARCHAR},</if>
-			<if test="taoBaoOrderEnd6Num != null">#{taoBaoOrderEnd6Num,jdbcType=VARCHAR},</if>
-		</trim>
-	</insert>
-
-
-
-	<update id="updateByPrimaryKey" parameterType="com.yeshi.fanli.entity.bus.user.UserExtraTaoBaoInfo">update
-		yeshi_ec_user_info_extra_taobao set uiet_uid =
-		#{user.id,jdbcType=BIGINT},uiet_relation_id =
-		#{relationId,jdbcType=VARCHAR},uiet_relation_update_time =
-		#{relationUpdateTime,jdbcType=TIMESTAMP},uiet_special_id =
-		#{specialId,jdbcType=VARCHAR},uiet_special_update_time =
-		#{specialUpdateTime,jdbcType=TIMESTAMP},uiet_create_time =
-		#{createTime,jdbcType=TIMESTAMP},uiet_update_time =
-		#{updateTime,jdbcType=TIMESTAMP} ,uiet_relation_valid
-		=#{relationValid,jdbcType=BOOLEAN} ,uiet_special_valid
-		=#{specialValid,jdbcType=BOOLEAN} ,uiet_taobao_uid
-		=#{taoBaoUid,jdbcType=VARCHAR},uiet_taobao_order_end_6_num
-		=#{taoBaoOrderEnd6Num,jdbcType=VARCHAR}
-		where uiet_id =
-		#{id,jdbcType=BIGINT}
-	</update>
-	<update id="updateByPrimaryKeySelective" parameterType="com.yeshi.fanli.entity.bus.user.UserExtraTaoBaoInfo">
-		update yeshi_ec_user_info_extra_taobao
-		<set>
-			<if test="user != null">uiet_uid=#{user.id,jdbcType=BIGINT},</if>
-			<if test="relationId != null">uiet_relation_id=#{relationId,jdbcType=VARCHAR},</if>
-			<if test="relationUpdateTime != null">uiet_relation_update_time=#{relationUpdateTime,jdbcType=TIMESTAMP},
-			</if>
-			<if test="specialId != null">uiet_special_id=#{specialId,jdbcType=VARCHAR},</if>
-			<if test="specialUpdateTime != null">uiet_special_update_time=#{specialUpdateTime,jdbcType=TIMESTAMP},
-			</if>
-			<if test="createTime != null">uiet_create_time=#{createTime,jdbcType=TIMESTAMP},</if>
-			<if test="updateTime != null">uiet_update_time=#{updateTime,jdbcType=TIMESTAMP},</if>
-			<if test="id !=null">uiet_id =#{id,jdbcType=BIGINT},</if>
-			<if test="relationValid !=null">uiet_relation_valid =#{relationValid,jdbcType=BOOLEAN},
-			</if>
-			<if test="specialValid !=null">uiet_special_valid =#{specialValid,jdbcType=BOOLEAN},
-			</if>
-			<if test="taoBaoUid !=null">uiet_taobao_uid =#{taoBaoUid,jdbcType=VARCHAR},</if>
-			<if test="taoBaoOrderEnd6Num !=null">uiet_taobao_order_end_6_num=#{taoBaoOrderEnd6Num,jdbcType=VARCHAR},
-			</if>
-		</set>
-		where uiet_id = #{id,jdbcType=BIGINT}
-	</update>
-	<update id="clearUid" parameterType="java.lang.Long">
-		update
-		yeshi_ec_user_info_extra_taobao set uiet_uid=null where uiet_uid=#{0}
-	</update>
+  
+  <delete id="deleteByPrimaryKey" parameterType="java.lang.Long">delete from yeshi_ec_user_info_extra_taobao where uiet_id = #{id,jdbcType=BIGINT}</delete>
+  <insert id="insert" parameterType="com.yeshi.fanli.entity.bus.user.UserExtraTaoBaoInfo" useGeneratedKeys="true" keyProperty="id">insert into yeshi_ec_user_info_extra_taobao (uiet_id,uiet_uid,uiet_relation_id,uiet_relation_valid,uiet_relation_update_time,uiet_special_id,uiet_special_valid,uiet_special_update_time,uiet_taobao_uid,uiet_taobao_order_end_6_num,uiet_taobao_nick_name,uiet_create_time,uiet_update_time) values (#{id,jdbcType=BIGINT},#{user.id,jdbcType=BIGINT},#{relationId,jdbcType=VARCHAR},#{relationValid,jdbcType=BOOLEAN},#{relationUpdateTime,jdbcType=TIMESTAMP},#{specialId,jdbcType=VARCHAR},#{specialValid,jdbcType=BOOLEAN},#{specialUpdateTime,jdbcType=TIMESTAMP},#{taoBaoUid,jdbcType=VARCHAR},#{taoBaoOrderEnd6Num,jdbcType=VARCHAR},#{taoBaoNickName,jdbcType=VARCHAR},#{createTime,jdbcType=TIMESTAMP},#{updateTime,jdbcType=TIMESTAMP})</insert>
+  <insert id="insertSelective" parameterType="com.yeshi.fanli.entity.bus.user.UserExtraTaoBaoInfo" useGeneratedKeys="true" keyProperty="id">insert into yeshi_ec_user_info_extra_taobao
+    <trim prefix="(" suffix=")" suffixOverrides=",">
+      <if test="id != null">uiet_id,</if>
+      <if test="user != null">uiet_uid,</if>
+      <if test="relationId != null">uiet_relation_id,</if>
+      <if test="relationValid != null">uiet_relation_valid,</if>
+      <if test="relationUpdateTime != null">uiet_relation_update_time,</if>
+      <if test="specialId != null">uiet_special_id,</if>
+      <if test="specialValid != null">uiet_special_valid,</if>
+      <if test="specialUpdateTime != null">uiet_special_update_time,</if>
+      <if test="taoBaoUid != null">uiet_taobao_uid,</if>
+      <if test="taoBaoOrderEnd6Num != null">uiet_taobao_order_end_6_num,</if>
+      <if test="taoBaoNickName != null">uiet_taobao_nick_name,</if>
+      <if test="createTime != null">uiet_create_time,</if>
+      <if test="updateTime != null">uiet_update_time,</if>
+    </trim>values
+    <trim prefix="(" suffix=")" suffixOverrides=",">
+      <if test="id != null">#{id,jdbcType=BIGINT},</if>
+      <if test="user != null">#{user.id,jdbcType=BIGINT},</if>
+      <if test="relationId != null">#{relationId,jdbcType=VARCHAR},</if>
+      <if test="relationValid != null">#{relationValid,jdbcType=BOOLEAN},</if>
+      <if test="relationUpdateTime != null">#{relationUpdateTime,jdbcType=TIMESTAMP},</if>
+      <if test="specialId != null">#{specialId,jdbcType=VARCHAR},</if>
+      <if test="specialValid != null">#{specialValid,jdbcType=BOOLEAN},</if>
+      <if test="specialUpdateTime != null">#{specialUpdateTime,jdbcType=TIMESTAMP},</if>
+      <if test="taoBaoUid != null">#{taoBaoUid,jdbcType=VARCHAR},</if>
+      <if test="taoBaoOrderEnd6Num != null">#{taoBaoOrderEnd6Num,jdbcType=VARCHAR},</if>
+      <if test="taoBaoNickName != null">#{taoBaoNickName,jdbcType=VARCHAR},</if>
+      <if test="createTime != null">#{createTime,jdbcType=TIMESTAMP},</if>
+      <if test="updateTime != null">#{updateTime,jdbcType=TIMESTAMP},</if>
+    </trim>
+  </insert>
+  <update id="updateByPrimaryKey" parameterType="com.yeshi.fanli.entity.bus.user.UserExtraTaoBaoInfo">update yeshi_ec_user_info_extra_taobao set uiet_uid = #{user.id,jdbcType=BIGINT},uiet_relation_id = #{relationId,jdbcType=VARCHAR},uiet_relation_valid = #{relationValid,jdbcType=BOOLEAN},uiet_relation_update_time = #{relationUpdateTime,jdbcType=TIMESTAMP},uiet_special_id = #{specialId,jdbcType=VARCHAR},uiet_special_valid = #{specialValid,jdbcType=BOOLEAN},uiet_special_update_time = #{specialUpdateTime,jdbcType=TIMESTAMP},uiet_taobao_uid = #{taoBaoUid,jdbcType=VARCHAR},uiet_taobao_order_end_6_num = #{taoBaoOrderEnd6Num,jdbcType=VARCHAR},uiet_taobao_nick_name = #{taoBaoNickName,jdbcType=VARCHAR},uiet_create_time = #{createTime,jdbcType=TIMESTAMP},uiet_update_time = #{updateTime,jdbcType=TIMESTAMP} where uiet_id = #{id,jdbcType=BIGINT}</update>
+  <update id="updateByPrimaryKeySelective" parameterType="com.yeshi.fanli.entity.bus.user.UserExtraTaoBaoInfo">update yeshi_ec_user_info_extra_taobao
+    <set>
+      <if test="user != null">uiet_uid=#{user.id,jdbcType=BIGINT},</if>
+      <if test="relationId != null">uiet_relation_id=#{relationId,jdbcType=VARCHAR},</if>
+      <if test="relationValid != null">uiet_relation_valid=#{relationValid,jdbcType=BOOLEAN},</if>
+      <if test="relationUpdateTime != null">uiet_relation_update_time=#{relationUpdateTime,jdbcType=TIMESTAMP},</if>
+      <if test="specialId != null">uiet_special_id=#{specialId,jdbcType=VARCHAR},</if>
+      <if test="specialValid != null">uiet_special_valid=#{specialValid,jdbcType=BOOLEAN},</if>
+      <if test="specialUpdateTime != null">uiet_special_update_time=#{specialUpdateTime,jdbcType=TIMESTAMP},</if>
+      <if test="taoBaoUid != null">uiet_taobao_uid=#{taoBaoUid,jdbcType=VARCHAR},</if>
+      <if test="taoBaoOrderEnd6Num != null">uiet_taobao_order_end_6_num=#{taoBaoOrderEnd6Num,jdbcType=VARCHAR},</if>
+      <if test="taoBaoNickName != null">uiet_taobao_nick_name=#{taoBaoNickName,jdbcType=VARCHAR},</if>
+      <if test="createTime != null">uiet_create_time=#{createTime,jdbcType=TIMESTAMP},</if>
+      <if test="updateTime != null">uiet_update_time=#{updateTime,jdbcType=TIMESTAMP},</if>
+    </set> where uiet_id = #{id,jdbcType=BIGINT}
+  </update>
+  
+  <update id="clearUid" parameterType="java.lang.Long">
+	update yeshi_ec_user_info_extra_taobao set uiet_uid=null where uiet_uid=#{0}
+  </update>
+	
 </mapper>

--
Gitblit v1.8.0