From 8a23fdc23fc1b5edda31743de005a108fa1b7543 Mon Sep 17 00:00:00 2001 From: yujian <yujian> Date: 星期四, 14 三月 2019 09:42:37 +0800 Subject: [PATCH] 用户列表调整 --- fanli/src/main/java/com/yeshi/fanli/mapping/UserInfoMapper.xml | 15 +++++++++------ 1 files changed, 9 insertions(+), 6 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 69a72aa..dbb6d40 100644 --- a/fanli/src/main/java/com/yeshi/fanli/mapping/UserInfoMapper.xml +++ b/fanli/src/main/java/com/yeshi/fanli/mapping/UserInfoMapper.xml @@ -64,11 +64,12 @@ <result column="totalOrder" property="totalOrder" jdbcType="BIGINT" /> <result column="monthOrder" property="monthOrder" jdbcType="BIGINT" /> + <result column="taoBaoUid" property="taoBaoUid" jdbcType="VARCHAR" /> - <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="wxUnionIdInvalid" property="wxUnionIdInvalid" jdbcType="VARCHAR" /> + <result column="taobaoUidInvalid" property="taobaoUidInvalid" jdbcType="VARCHAR" /> + <result column="phoneInvalid" property="phoneInvalid" jdbcType="VARCHAR" /> + <result column="alipayAccountInvalid" property="alipayAccountInvalid" jdbcType="VARCHAR" /> </resultMap> @@ -264,17 +265,19 @@ LEFT JOIN yeshi_ec_binding_account b ON u.`id` = b.`uid` LEFT JOIN yeshi_ec_user_info_extra ext ON u.`id` = ext.uie_uid LEFT JOIN yeshi_ec_user_rank rak ON rak.ur_id = ext.uie_rank_id + LEFT JOIN yeshi_ec_user_info_extra_taobao tb ON tb.`uiet_uid` = u.id <if test="userState == 2"> <!-- 灏佺鐢ㄦ埛 --> LEFT JOIN - (SELECT A.uid AS buid,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 A.uid AS buid,MAX(A.f_wxUnionId) AS wxUnionIdInvalid ,MAX(A.f_taobaoUid) AS taobaoUidInvalid,MAX(A.f_phone) AS phoneInvalid,MAX(A.f_alipayAccount) AS alipayAccountInvalid 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 yeshi_ec_user_info_extra_taobao tb ON tb.`uiet_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`) + FROM yeshi_ec_forbidden_user_identify_code fc)fu ON (fu.f_wxUnionId = u.`wx_union_id` OR fu.f_taobaoUid = tb.`uiet_taobao_uid` OR fu.f_phone = u.`phone` OR fu.f_alipayAccount = b.`account`) WHERE b.`type`= 1 AND fu.fuc_effective = 1 )A GROUP BY A.uid) B ON u.id= B.buid </if> -- Gitblit v1.8.0