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 f60530a8c..7da4dfa43 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 @@ -1,5 +1,6 @@ package com.accompany.admin.vo.room; +import com.alibaba.excel.annotation.ExcelIgnore; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -17,7 +18,19 @@ public class RoomDaySendRankRewardRecordAdminVo { @ApiModelProperty("统计日期") private String statDate; - @ExcelProperty("分区ID") + @ExcelIgnore + @ApiModelProperty("房间UID") + private Long roomUid; + + @ExcelProperty("房间id") + @ApiModelProperty("房间id") + private Long erbanNo; + + @ExcelProperty("房间标题") + @ApiModelProperty("房间标题") + private String roomTitle; + + @ExcelIgnore @ApiModelProperty("分区ID") private Integer partitionId; @@ -25,13 +38,9 @@ public class RoomDaySendRankRewardRecordAdminVo { @ApiModelProperty("分区描述") private String partitionIdDesc; - @ExcelProperty("房主erbanNo") - @ApiModelProperty("房主erbanNo") - private Long erbanNo; - - @ExcelProperty("房间UID") - @ApiModelProperty("房间UID") - private Long roomUid; + @ExcelProperty("地区名称") + @ApiModelProperty("地区名称") + private String regionName; @ExcelProperty("房间流水金额") @NumberFormat("#.##") @@ -48,24 +57,11 @@ public class RoomDaySendRankRewardRecordAdminVo { @ExcelProperty("目标获得金币") @ApiModelProperty("目标获得金币") - private Long ownerReceiveReward; - - @ExcelProperty("用户贡献比例") - @NumberFormat("#.##") - @ApiModelProperty("用户贡献比例") - private BigDecimal rewardRatio; + private Long ownerReward; @ExcelProperty("已获得金币") @ApiModelProperty("已获得金币") - private Long userReceiveReward; - - @ExcelProperty("房间标题") - @ApiModelProperty("房间标题") - private String roomTitle; - - @ExcelProperty("地区名称") - @ApiModelProperty("地区名称") - private String regionName; + private Long ownerReceiveReward; @ExcelProperty("领取时间") @ApiModelProperty("领取时间") diff --git a/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/room/RoomDaySendRankRewardAdminService.java b/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/room/RoomDaySendRankRewardAdminService.java index d8fe259d1..8c96f1201 100644 --- a/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/room/RoomDaySendRankRewardAdminService.java +++ b/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/room/RoomDaySendRankRewardAdminService.java @@ -31,10 +31,6 @@ public class RoomDaySendRankRewardAdminService extends ServiceImpl pageRecord(Integer partitionId, Integer regionId, Long erbanNo, Integer status, String startDate, String endDate, 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 1e2cd6e2a..b34fa24cf 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 @@ -5,17 +5,18 @@