房间日流水bugfixed
This commit is contained in:
@@ -4,24 +4,24 @@
|
||||
|
||||
<select id="listRecord" resultType="com.accompany.business.vo.room.RoomDayDiamondRewardRecordVo">
|
||||
SELECT
|
||||
rn.id id,
|
||||
gm.guild_id guildId,
|
||||
owner.erban_no ownerErbanNo,
|
||||
rn.partition_id partitionId,
|
||||
rn.room_uid roomUid,
|
||||
u.erban_no erbanNo,
|
||||
rn.stat_date statDate,
|
||||
rn.diamond_num diamondNum,
|
||||
rn.gold_num goldNum,
|
||||
rm.`title` roomName,
|
||||
ri.`name` regionName,
|
||||
reward.reward_gold rewardGold,
|
||||
au.username operator,
|
||||
pi.`desc` partitionIdDesc,
|
||||
if(reward.id is null, 0, 1) `status`,
|
||||
rn.id id,
|
||||
gm.guild_id guildId,
|
||||
owner.erban_no ownerErbanNo,
|
||||
rn.partition_id partitionId,
|
||||
rn.room_uid roomUid,
|
||||
u.erban_no erbanNo,
|
||||
rn.stat_date statDate,
|
||||
rn.diamond_num diamondNum,
|
||||
rn.gold_num goldNum,
|
||||
rm.`title` roomName,
|
||||
ri.`name` regionName,
|
||||
reward.reward_gold rewardGold,
|
||||
au.username operator,
|
||||
pi.`desc` partitionIdDesc,
|
||||
if(reward.id is null, if(rrr.room_uid is null, 0, 1), 1) `status`,
|
||||
reward.create_time createTime
|
||||
FROM
|
||||
room_day_diamond_num rn
|
||||
room_day_diamond_num rn
|
||||
LEFT JOIN room_day_diamond_reward_record reward ON rn.partition_id = reward.partition_id
|
||||
and rn.room_uid = reward.room_uid and rn.stat_date = reward.stat_date
|
||||
left join guild_member gm on gm.uid = rn.room_uid and gm.`enable` = 1
|
||||
@@ -32,6 +32,9 @@
|
||||
left join region_info ri on u.region_id = ri.id
|
||||
left join admin_user au on au.id = reward.admin_id
|
||||
left join partition_info pi on rn.partition_id = pi.id
|
||||
left join (select partition_id, room_uid, stat_date, sum(reward_gold), reward_gold
|
||||
from room_day_diamond_reward_recv_record GROUP BY partition_id,room_uid,stat_date) rrr
|
||||
on rn.partition_id = rrr.partition_id and rn.room_uid = rrr.room_uid and rn.stat_date = rrr.stat_date
|
||||
<where>
|
||||
<if test="partitionId != null and partitionId != 0">
|
||||
and rn.partition_id = #{partitionId}
|
||||
@@ -50,10 +53,10 @@
|
||||
</if>
|
||||
<choose>
|
||||
<when test="status != null and status == 0">
|
||||
and reward.id is null
|
||||
and reward.id is null and rrr.room_uid is null
|
||||
</when>
|
||||
<when test="status != null and (status == 1)">
|
||||
and reward.id is not null
|
||||
<when test="status != null and status == 1">
|
||||
and (reward.id is not null or rrr.room_uid is not null)
|
||||
</when>
|
||||
<when test="status != null and status == 2">
|
||||
and rn.stat_date = #{todayDayDate}
|
||||
|
Reference in New Issue
Block a user