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/redpack/RedPackWinInviteMapper.xml | 18 ++++++++++++++++--
1 files changed, 16 insertions(+), 2 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/mapping/redpack/RedPackWinInviteMapper.xml b/fanli/src/main/java/com/yeshi/fanli/mapping/redpack/RedPackWinInviteMapper.xml
index a658e1d..064d22c 100644
--- a/fanli/src/main/java/com/yeshi/fanli/mapping/redpack/RedPackWinInviteMapper.xml
+++ b/fanli/src/main/java/com/yeshi/fanli/mapping/redpack/RedPackWinInviteMapper.xml
@@ -108,10 +108,10 @@
</select>
<select id="getWinTopListByBossId" resultMap="BaseResultMap">
- SELECT SUM(d.`rwr_money`)AS rwr_money,d.`rwr_team_uid` FROM `yeshi_ec_red_pack_win_invite` d
+ SELECT SUM(d.`rwr_money`)AS rwr_money,d.`rwr_team_uid`,MIN(d.`rwr_id`) AS orderId FROM `yeshi_ec_red_pack_win_invite` d
WHERE d.`rwr_uid` = #{uid} AND d.`rwr_type` <![CDATA[<>]]> 'newUserReward'
GROUP BY d.`rwr_team_uid`
- ORDER BY rwr_money DESC
+ ORDER BY orderId
LIMIT #{start},#{count}
</select>
@@ -128,4 +128,18 @@
</select>
+ <select id="query" resultMap="BaseResultMap">
+ SELECT * FROM `yeshi_ec_red_pack_win_invite` d
+ WHERE 1=1 <if test="key != null and key != ''">AND d.`rwr_uid` = #{key}</if>
+ <if test="type != null">AND d.`rwr_type`= #{type}</if>
+ ORDER BY d.rwr_id DESC
+ LIMIT #{start},#{count}
+ </select>
+
+ <select id="count" resultType="Long">
+ SELECT COUNT(DISTINCT d.`rwr_id`) FROM `yeshi_ec_red_pack_win_invite` d
+ WHERE 1=1 <if test="key != null and key != ''">AND d.`rwr_uid` = #{key}</if>
+ <if test="type != null">AND d.`rwr_type`= #{type}</if>
+ </select>
+
</mapper>
--
Gitblit v1.8.0