diff --git a/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/vo/guildsoviet/GuildMemberSovietAdminVo.java b/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/vo/guildsoviet/GuildMemberSovietAdminVo.java index afa585a79..9e669aa21 100644 --- a/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/vo/guildsoviet/GuildMemberSovietAdminVo.java +++ b/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/vo/guildsoviet/GuildMemberSovietAdminVo.java @@ -58,4 +58,9 @@ public class GuildMemberSovietAdminVo { @ExcelProperty("公会长额外收益") @ApiModelProperty("公会长额外收益") private BigDecimal guildExtraDiamondNum; + + + @ExcelProperty("公会长额外收益发放状态0-未发放,1-已发放") + @ApiModelProperty("公会长额外收益发放状态0-未发放,1-已发放") + private Byte ownerSendStatus; } diff --git a/accompany-business/accompany-business-service/src/main/resources/accompany/sqlmappers/GuildExtraDiamondDayMapper.xml b/accompany-business/accompany-business-service/src/main/resources/accompany/sqlmappers/GuildExtraDiamondDayMapper.xml index eaced8361..dca71bfa8 100644 --- a/accompany-business/accompany-business-service/src/main/resources/accompany/sqlmappers/GuildExtraDiamondDayMapper.xml +++ b/accompany-business/accompany-business-service/src/main/resources/accompany/sqlmappers/GuildExtraDiamondDayMapper.xml @@ -134,6 +134,7 @@ r.`name` regionName, gm.`enable` enbale, ge.anchor_send_status anchorSendStatus, + ge.owner_send_status ownerSendStatus, sum(diamond_num + lucky_diamond_num) diamondNum, sum(anchor_extra_num + anchor_extra_lucky_num) extraDiamondNum, sum(owner_extra_num + owner_extra_lucky_num) guildExtraDiamondNum