From 4a05f1c9c508ab7f10c5eae22a5c716f5454ca02 Mon Sep 17 00:00:00 2001
From: yujian <yujian>
Date: 星期二, 12 三月 2019 16:29:55 +0800
Subject: [PATCH] 冲突提交
---
fanli/src/main/java/com/yeshi/fanli/mapping/user/ForbiddenUserIdentifyCodeMapper.xml | 81 ++++++++++++++++++++++++++++++++++++++++
1 files changed, 81 insertions(+), 0 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/mapping/user/ForbiddenUserIdentifyCodeMapper.xml b/fanli/src/main/java/com/yeshi/fanli/mapping/user/ForbiddenUserIdentifyCodeMapper.xml
index 587dc8a..8948650 100644
--- a/fanli/src/main/java/com/yeshi/fanli/mapping/user/ForbiddenUserIdentifyCodeMapper.xml
+++ b/fanli/src/main/java/com/yeshi/fanli/mapping/user/ForbiddenUserIdentifyCodeMapper.xml
@@ -17,6 +17,21 @@
<result column="fuc_update_time" property="updateTime"
jdbcType="TIMESTAMP" />
</resultMap>
+
+ <resultMap id="BaseResultMapVO" type="com.yeshi.fanli.vo.user.ForbiddenUserIdentifyCodeVO">
+ <result column="f_wxUnionId" property="f_wxUnionId" jdbcType="VARCHAR" />
+ <result column="f_taobaoUid" property="f_taobaoUid" jdbcType="VARCHAR" />
+ <result column="f_phone" property="f_phone" jdbcType="VARCHAR" />
+ <result column="f_alipayAccount" property="f_alipayAccount" jdbcType="VARCHAR" />
+
+ <result column="alipayAccount" property="alipayAccount" jdbcType="VARCHAR" />
+ <result column="alipayAccountName" property="alipayAccountName" jdbcType="VARCHAR" />
+
+ <association property="userInfo" column="id"
+ resultMap="com.yeshi.fanli.dao.mybatis.UserInfoMapper.BaseResultMap"/>
+
+ </resultMap>
+
<sql id="Base_Column_List">fuc_id,fuc_type,fuc_identify_code,fuc_effective,fuc_create_time,fuc_update_time,fuc_beizhu
</sql>
<select id="selectByPrimaryKey" resultMap="BaseResultMap"
@@ -95,4 +110,70 @@
</set>
where fuc_id = #{id,jdbcType=BIGINT}
</update>
+
+ <select id="listQuery" resultMap="BaseResultMapVO">
+ SELECT * FROM (SELECT A.uid,A.alipayAccount,A.alipayAccountName,MAX(A.f_wxUnionId) AS f_wxUnionId ,MAX(A.f_taobaoUid) AS f_taobaoUid,MAX(A.f_phone) AS f_phone,MAX(A.f_alipayAccount) AS f_alipayAccount FROM
+ (SELECT u.`id`AS uid,b.account AS alipayAccount,b.name AS alipayAccountName,fu.* FROM yeshi_ec_user u
+ LEFT JOIN yeshi_ec_binding_account b ON b.`uid` = u.`id`
+ LEFT JOIN (SELECT fc.fuc_effective,IF(fc.`fuc_type` = 'wxUnionId',fc.`fuc_identify_code`,NULL)AS f_wxUnionId,
+ IF(fc.`fuc_type` = 'taobaoUid',fc.`fuc_identify_code`,NULL)AS f_taobaoUid,
+ IF(fc.`fuc_type` = 'phone',fc.`fuc_identify_code`,NULL)AS f_phone,
+ IF(fc.`fuc_type` = 'alipayAccount',fc.`fuc_identify_code`,NULL)AS f_alipayAccount
+ FROM yeshi_ec_forbidden_user_identify_code fc)fu ON (fu.f_wxUnionId = u.`wx_union_id` OR fu.f_taobaoUid = u.`identifycode` OR fu.f_phone = u.`phone` OR fu.f_alipayAccount = b.`account`)
+ WHERE b.`type`= 1 AND fu.fuc_effective = 1
+
+ <if test="key != null and key != '' ">
+ AND fu.fuc_identify_code = '%#{key}%'
+ </if>
+ <if test="type == 1">
+ AND fu.fuc_type = 'wxUnionId'
+ </if>
+ <if test="type == 2">
+ AND fu.fuc_type = 'taobaoUid'
+ </if>
+ <if test="type == 3">
+ AND fu.fuc_type = 'phone'
+ </if>
+ <if test="type == 4">
+ AND fu.fuc_type = 'alipayAccount'
+ </if>
+
+ )A
+ GROUP BY A.uid) B
+ LEFT JOIN yeshi_ec_user u ON u.id= B.uid
+ LIMIT ${start},${count}
+ </select>
+
+ <select id="countQuery" resultType="java.lang.Long">
+
+ SELECT IFNULL(COUNT(DISTINCT A.uid),0) FROM
+ (SELECT u.`id`AS uid,fu.* FROM yeshi_ec_user u
+ LEFT JOIN yeshi_ec_binding_account b ON b.`uid` = u.`id`
+ LEFT JOIN (SELECT fc.fuc_effective,IF(fc.`fuc_type` = 'wxUnionId',fc.`fuc_identify_code`,NULL)AS f_wxUnionId,
+ IF(fc.`fuc_type` = 'taobaoUid',fc.`fuc_identify_code`,NULL)AS f_taobaoUid,
+ IF(fc.`fuc_type` = 'phone',fc.`fuc_identify_code`,NULL)AS f_phone,
+ IF(fc.`fuc_type` = 'alipayAccount',fc.`fuc_identify_code`,NULL)AS f_alipayAccount
+ FROM yeshi_ec_forbidden_user_identify_code fc)fu ON (fu.f_wxUnionId = u.`wx_union_id` OR fu.f_taobaoUid = u.`identifycode` OR fu.f_phone = u.`phone` OR fu.f_alipayAccount = b.`account`)
+ WHERE b.`type`= 1 AND fu.fuc_effective = 1
+
+ <if test="key != null and key != '' ">
+ AND fu.fuc_identify_code = '%#{key}%'
+ </if>
+ <if test="type == 1">
+ AND fu.fuc_type = 'wxUnionId'
+ </if>
+ <if test="type == 2">
+ AND fu.fuc_type = 'taobaoUid'
+ </if>
+ <if test="type == 3">
+ AND fu.fuc_type = 'phone'
+ </if>
+ <if test="type == 4">
+ AND fu.fuc_type = 'alipayAccount'
+ </if>
+ )A
+
+ </select>
+
+
</mapper>
--
Gitblit v1.8.0