房间周流水-后台-状态

This commit is contained in:
2025-08-29 15:31:17 +08:00
parent 6a810427ff
commit 88b2d6acf8
3 changed files with 10 additions and 11 deletions

View File

@@ -31,11 +31,11 @@ public class RoomWeekDiamondRewardRecordAdminVo {
@ExcelProperty("日期")
@ApiModelProperty("日期")
private String statDate;
@ExcelProperty("钻石流水")
@ApiModelProperty("钻石流水")
private BigDecimal diamondNum;
@ExcelProperty("金币流水")
@ApiModelProperty("金币流水")
private BigDecimal diamondNum;
@ExcelProperty("钻石流水")
@ApiModelProperty("钻石流水")
private BigDecimal goldNum;
@ExcelIgnore
@ApiModelProperty("奖励等级id")
@@ -46,8 +46,8 @@ public class RoomWeekDiamondRewardRecordAdminVo {
@ExcelProperty("对应流水发放金币")
@ApiModelProperty("对应流水发放金币")
private BigDecimal rewardGold;
@ExcelProperty("发放状态0:未发放,1已经发放")
@ApiModelProperty("发放状态0:未发放,1已经发放")
@ExcelProperty("发放状态0:不可发放1未发放,2已发放")
@ApiModelProperty("发放状态0:不可发放1未发放,2已发放")
private Byte status;
@ExcelProperty("操作人")
@ApiModelProperty("操作人")

View File

@@ -124,9 +124,6 @@ public class RoomWeekDiamondRewardRecordAdminService extends ServiceImpl<RoomWee
if (row.getCreateTime() != null) {
row.setSendTime(DateUtil.formatDateTime(row.getCreateTime()));
}
if (row.getRewardGold() != null) {
continue;
}
TreeMap<BigDecimal, RoomWeekDiamondReward> dayDiamondRewardTreeMap = partitionTreeMap.get(row.getPartitionId());
RoomWeekDiamondReward rewardLevel = roomWeekDiamondRewardService.calReward(dayDiamondRewardTreeMap, row.getDiamondNum());
if (null == rewardLevel){

View File

@@ -17,7 +17,7 @@
reward.reward_gold rewardGold,
au.username operator,
pi.`desc` partitionIdDesc,
if(reward.id is null, 0, 1) `status`,
(case when rn.stat_date = #{notEqualsTodate} then 0 when reward.id is null then 1 else 2 end) `status`,
reward.create_time createTime
FROM
room_week_diamond_num rn
@@ -48,16 +48,18 @@
</if>
<choose>
<when test="status != null and status == 0">
and reward.id is null
and rn.stat_date = #{notEqualsTodate}
</when>
<when test="status != null and status == 1">
and rn.stat_date != #{notEqualsTodate} and reward.id is null
</when>
<when test="status != null and status == 2">
and reward.id is not null
</when>
</choose>
<if test="guildId != null">
and gm.guild_id = #{guildId}
</if>
and rn.stat_date != #{notEqualsTodate}
</where>
order by rn.stat_date desc, rn.diamond_num desc, `status` asc
</select>