From dd5b15229cb15459fa7c31ccea77dac28cbfafbd Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期一, 13 四月 2020 10:04:20 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into div
---
fanli/src/main/java/com/yeshi/fanli/mapping/UserInfoCountMapper.xml | 32 +++++++++++++++++++++++++++++++-
1 files changed, 31 insertions(+), 1 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/mapping/UserInfoCountMapper.xml b/fanli/src/main/java/com/yeshi/fanli/mapping/UserInfoCountMapper.xml
index d76152f..9bf0f59 100644
--- a/fanli/src/main/java/com/yeshi/fanli/mapping/UserInfoCountMapper.xml
+++ b/fanli/src/main/java/com/yeshi/fanli/mapping/UserInfoCountMapper.xml
@@ -10,6 +10,32 @@
<result column="goldCoin" property="goldCoin" jdbcType="INTEGER" />
</resultMap>
+ <resultMap id="BaseResultMap" type="com.yeshi.fanli.entity.bus.user.UserInfo">
+ <id column="id" property="id" jdbcType="BIGINT" />
+ <result column="identifycode" property="openid" jdbcType="VARCHAR" />
+ <result column="login_type" property="loginType" jdbcType="INTEGER" />
+ <result column="wx_open_id" property="wxOpenId" jdbcType="VARCHAR" />
+ <result column="wx_union_id" property="wxUnionId" jdbcType="VARCHAR" />
+ <result column="nick_name" property="nickName" jdbcType="VARCHAR" />
+ <result column="tbName" property="tbName" jdbcType="VARCHAR" />
+ <result column="tbPic" property="tbPic" jdbcType="VARCHAR" />
+ <result column="wxName" property="wxName" jdbcType="VARCHAR" />
+ <result column="wxPic" property="wxPic" jdbcType="VARCHAR" />
+ <result column="portrait" property="portrait" jdbcType="VARCHAR" />
+ <result column="createtime" property="createtime" jdbcType="BIGINT" />
+ <result column="last_logintime" property="lastLoginTime"
+ jdbcType="BIGINT" />
+ <result column="loginip" property="lastLoginIp" jdbcType="VARCHAR" />
+ <result column="type" property="type" jdbcType="INTEGER" />
+ <result column="appid" property="appId" jdbcType="VARCHAR" />
+ <result column="my_hongBao" property="myHongBao" jdbcType="DECIMAL" />
+ <result column="pay_password" property="payPassword" jdbcType="VARCHAR" />
+ <result column="rank" property="rank" jdbcType="INTEGER" />
+ <result column="phone" property="phone" jdbcType="VARCHAR" />
+ <result column="state" property="state" jdbcType="INTEGER" />
+ <result column="state_desc" property="stateDesc" jdbcType="VARCHAR" />
+ </resultMap>
+
<select id="listByUserGoldCoin" resultMap="UserGoldCoinMapVO">
SELECT IFNULL(SUM(d.`td_money`),0) AS goldCoin,u.`id`,u.`nick_name`,u.`portrait`
@@ -18,8 +44,9 @@
WHERE 1=1
<if test="type == 1">AND d.`td_money`<![CDATA[>]]> 0</if>
<if test="type == 2">AND d.`td_money`<![CDATA[<]]> 0</if>
+ <if test="key != null and key !='' ">AND d.`td_uid`LIKE '%${key}%'</if>
GROUP BY d.`td_uid`
- ORDER BY goldCoin <if test="type = 1">DESC</if>
+ ORDER BY goldCoin <if test="type == 1">DESC</if>
LIMIT #{start},#{count}
</select>
@@ -29,18 +56,21 @@
WHERE 1=1
<if test="type == 1">AND d.`td_money`<![CDATA[>]]> 0</if>
<if test="type == 2">AND d.`td_money`<![CDATA[<]]> 0</if>
+ <if test="key != null and key !='' ">AND d.`td_uid` LIKE '%${key}%'</if>
</select>
<select id="listByHasGoldCoin" resultMap="UserGoldCoinMapVO">
SELECT IFNULL(t.`uie_gold_coin`,0) AS goldCoin,u.`id`,u.`nick_name`,u.`portrait`
FROM `yeshi_ec_user_info_extra` t
LEFT JOIN `yeshi_ec_user` u ON t.`uie_uid` = u.`id`
+ WHERE 1=1 <if test="key != null and key !='' ">AND t.`uie_uid`LIKE '%${key}%'</if>
ORDER BY t.`uie_gold_coin` DESC
LIMIT #{start},#{count}
</select>
<select id="countByHasGoldCoin" resultType="Long">
SELECT IFNULL(COUNT(t.`uie_id`),0)FROM `yeshi_ec_user_info_extra` t
+ WHERE 1=1 <if test="key != null and key !='' ">AND t.`uie_uid`LIKE '%${key}%'</if>
</select>
</mapper>
--
Gitblit v1.8.0