From f46f344d9de62d53254173c68b59d3cdd2b71a9b Mon Sep 17 00:00:00 2001 From: khalil <842328916@qq.com> Date: Thu, 18 Sep 2025 15:50:08 +0800 Subject: [PATCH] =?UTF-8?q?=E6=88=BF=E9=97=B4=E6=97=A5=E5=A5=96=E5=8A=B1-?= =?UTF-8?q?=E5=90=8E=E5=8F=B0-=E5=AF=BC=E5=87=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../RoomDaySendRankRewardRecordAdminVo.java | 18 ++++++++++++++++++ ...RoomDaySendRankRewardUserRecordAdminVo.java | 15 +++++++++++++++ .../RoomDaySendRankRewardAdminMapper.xml | 2 +- 3 files changed, 34 insertions(+), 1 deletion(-) diff --git a/accompany-admin/accompany-admin-sdk/src/main/java/com/accompany/admin/vo/room/RoomDaySendRankRewardRecordAdminVo.java b/accompany-admin/accompany-admin-sdk/src/main/java/com/accompany/admin/vo/room/RoomDaySendRankRewardRecordAdminVo.java index 11bf3cbe9..f60530a8c 100644 --- a/accompany-admin/accompany-admin-sdk/src/main/java/com/accompany/admin/vo/room/RoomDaySendRankRewardRecordAdminVo.java +++ b/accompany-admin/accompany-admin-sdk/src/main/java/com/accompany/admin/vo/room/RoomDaySendRankRewardRecordAdminVo.java @@ -3,6 +3,8 @@ package com.accompany.admin.vo.room; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import com.alibaba.excel.annotation.ExcelProperty; +import com.alibaba.excel.annotation.format.NumberFormat; import java.math.BigDecimal; import java.util.Date; @@ -11,45 +13,61 @@ import java.util.Date; @ApiModel("房间日流水奖励记录") public class RoomDaySendRankRewardRecordAdminVo { + @ExcelProperty("统计日期") @ApiModelProperty("统计日期") private String statDate; + @ExcelProperty("分区ID") @ApiModelProperty("分区ID") private Integer partitionId; + @ExcelProperty("分区描述") @ApiModelProperty("分区描述") private String partitionIdDesc; + @ExcelProperty("房主erbanNo") @ApiModelProperty("房主erbanNo") private Long erbanNo; + @ExcelProperty("房间UID") @ApiModelProperty("房间UID") private Long roomUid; + @ExcelProperty("房间流水金额") + @NumberFormat("#.##") @ApiModelProperty("房间流水金额") private BigDecimal serialValue; + @ExcelProperty("奖励档位ID") @ApiModelProperty("奖励档位ID") private Long rewardId; + @ExcelProperty("等级名称") @ApiModelProperty("等级名称") private String levelName; + @ExcelProperty("目标获得金币") @ApiModelProperty("目标获得金币") private Long ownerReceiveReward; + @ExcelProperty("用户贡献比例") + @NumberFormat("#.##") @ApiModelProperty("用户贡献比例") private BigDecimal rewardRatio; + @ExcelProperty("已获得金币") @ApiModelProperty("已获得金币") private Long userReceiveReward; + @ExcelProperty("房间标题") @ApiModelProperty("房间标题") private String roomTitle; + @ExcelProperty("地区名称") @ApiModelProperty("地区名称") private String regionName; + @ExcelProperty("领取时间") @ApiModelProperty("领取时间") private Date receiveTime; } \ No newline at end of file diff --git a/accompany-admin/accompany-admin-sdk/src/main/java/com/accompany/admin/vo/room/RoomDaySendRankRewardUserRecordAdminVo.java b/accompany-admin/accompany-admin-sdk/src/main/java/com/accompany/admin/vo/room/RoomDaySendRankRewardUserRecordAdminVo.java index 02a912f5a..6681f3a4b 100644 --- a/accompany-admin/accompany-admin-sdk/src/main/java/com/accompany/admin/vo/room/RoomDaySendRankRewardUserRecordAdminVo.java +++ b/accompany-admin/accompany-admin-sdk/src/main/java/com/accompany/admin/vo/room/RoomDaySendRankRewardUserRecordAdminVo.java @@ -3,38 +3,53 @@ package com.accompany.admin.vo.room; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import com.alibaba.excel.annotation.ExcelProperty; +import com.alibaba.excel.annotation.format.NumberFormat; +import com.alibaba.excel.annotation.write.style.ColumnWidth; import java.math.BigDecimal; import java.util.Date; @Data @ApiModel("房间日流水奖励用户贡献记录") +@ColumnWidth(20) public class RoomDaySendRankRewardUserRecordAdminVo { + @ExcelProperty("统计日期") @ApiModelProperty("统计日期") private String statDate; + @ExcelProperty("用户erbanNo") @ApiModelProperty("用户erbanNo") private Long erbanNo; + @ExcelProperty("用户昵称") @ApiModelProperty("用户昵称") private String nick; + @ExcelProperty("用户贡献值") + @NumberFormat("#.##") @ApiModelProperty("用户贡献值") private BigDecimal userSerialValue; + @ExcelProperty("用户贡献比例") + @NumberFormat("#.##") @ApiModelProperty("用户贡献比例") private BigDecimal rewardRatio; + @ExcelProperty("用户奖励金币") @ApiModelProperty("用户奖励金币") private Long userReward; + @ExcelProperty("用户已领取奖励") @ApiModelProperty("用户已领取奖励") private Long userReceiveReward; + @ExcelProperty("排名") @ApiModelProperty("排名") private Integer rank; + @ExcelProperty("领取时间") @ApiModelProperty("领取时间") private Date receiveTime; diff --git a/accompany-admin/accompany-admin-service/src/main/resources/accompany/sqlmappers/RoomDaySendRankRewardAdminMapper.xml b/accompany-admin/accompany-admin-service/src/main/resources/accompany/sqlmappers/RoomDaySendRankRewardAdminMapper.xml index 6ec7f2504..1d9ce4703 100644 --- a/accompany-admin/accompany-admin-service/src/main/resources/accompany/sqlmappers/RoomDaySendRankRewardAdminMapper.xml +++ b/accompany-admin/accompany-admin-service/src/main/resources/accompany/sqlmappers/RoomDaySendRankRewardAdminMapper.xml @@ -52,7 +52,7 @@ rd.user_reward_ratio rewardRatio, rd.user_reward userReward, rd.user_receive_reward userReceiveReward, - rd.rank rank, + rd.`rank` `rank`, rd.receive_time receiveTime FROM room_day_send_rank_user_record rd LEFT JOIN users u ON rd.uid = u.uid