公会小时流水统计

ep-boom

.gitignore

@@ -1,13 +1,13 @@
 **/target/**
-*.iml
-*.idea
-target/
-.idea
-
 **/.DS_Store
 
 **/rebel.xml
-**/.rebel.xml.bak
-/tmpI18n/
 
-.lingma
+tmpI18n/
+python/
+
+.idea
+.lingma
+.qoder
+.qoderignore
+.vscode

Users/yeung/IdeaProjects/peko-java/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/mapper/room/RoomDaySendRankRewardAdminMapper.java

@@ -0,0 +1,23 @@
+public interface RoomDaySendRankRewardAdminMapper extends BaseMapper<RoomDaySendRankRoomRecord> {
+
+    IPage<RoomDaySendRankRewardRecordAdminVo> pageRecord(IPage<RoomDaySendRankRewardRecordAdminVo> iPage, 
+                                                         @Param("partitionId") Integer partitionId, 
+                                                         @Param("regionId") Integer regionId,
+                                                         @Param("roomUid") Long roomUid, 
+                                                         @Param("dateCycle") String dateCycle,
+                                                         @Param("status") Integer status, 
+                                                         @Param("guildId") Integer guildId);
+
+    IPage<RoomDaySendRankRewardRecordAdminVo> pageRoomFlow(IPage<RoomDaySendRankRewardRecordAdminVo> iPage,
+                                                           @Param("partitionId") Integer partitionId,
+                                                           @Param("regionId") Integer regionId,
+                                                           @Param("roomUid") Long roomUid,
+                                                           @Param("startDate") String startDate,
+                                                           @Param("endDate") String endDate,
+                                                           @Param("status") Integer status);
+
+    IPage<RoomDaySendRankRewardRecordAdminVo> pageRoomContribution(IPage<RoomDaySendRankRewardRecordAdminVo> iPage,
+                                                                   @Param("partitionId") Integer partitionId,
+                                                                   @Param("roomUid") Long roomUid,
+                                                                   @Param("dateCycle") String dateCycle);
+}

Users/yeung/IdeaProjects/peko-java/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/room/RoomDaySendRankRewardAdminService.java

@@ -0,0 +1,115 @@
+@Slf4j
+@Service
+public class RoomDaySendRankRewardAdminService extends ServiceImpl<RoomDaySendRankRewardAdminMapper, RoomDaySendRankRoomRecord> {
+
+    // ... existing methods ...
+
+    /**
+     * 查询房间流水记录
+     */
+    public PageResult<RoomDaySendRankRewardRecordAdminVo> pageRoomFlow(Integer partitionId, Integer regionId, Long roomUid, 
+                                                                      String startDate, String endDate, Integer status,
+                                                                      Integer pageNo, Integer pageSize) {
+        if (partitionId == null) {
+            throw new AdminServiceException("分区不能为空");
+        }
+
+        PartitionEnum partitionEnum = PartitionEnum.getByPartitionId(partitionId);
+        if (!partitionEnum.equals(PartitionEnum.ARAB)){
+            throw new AdminServiceException("该政策只在阿拉伯语区");
+        }
+
+        IPage<RoomDaySendRankRewardRecordAdminVo> iPage = new Page<>(pageNo, pageSize);
+        baseMapper.pageRoomFlow(iPage, partitionId, regionId, roomUid, startDate, endDate, status);
+
+        PageResult<RoomDaySendRankRewardRecordAdminVo> pageResult = new PageResult<>(iPage);
+        List<RoomDaySendRankRewardRecordAdminVo> rows = pageResult.getRows();
+        if (CollectionUtils.isEmpty(rows)) {
+            return pageResult;
+        }
+
+        Map<Long, RoomDaySendRankReward> rewardMap = new HashMap<>();
+        List<Long> rewardIds = rows.stream()
+                .filter(r -> r.getRewardId() != null)
+                .map(RoomDaySendRankRewardRecordAdminVo::getRewardId)
+                .toList();
+        
+        if (!rewardIds.isEmpty()) {
+            List<RoomDaySendRankReward> rewardList = roomDaySendRankRewardService.lambdaQuery()
+                    .in(RoomDaySendRankReward::getId, rewardIds)
+                    .list();
+            rewardMap.putAll(rewardList.stream().collect(
+                    java.util.stream.Collectors.toMap(RoomDaySendRankReward::getId, r -> r)));
+        }
+        
+        for (RoomDaySendRankRewardRecordAdminVo row : rows) {
+            if (row.getCreateTime() != null) {
+                row.setSendTime(DateUtil.formatDateTime(row.getCreateTime()));
+            }
+            
+            if (row.getRewardId() != null) {
+                RoomDaySendRankReward reward = rewardMap.get(row.getRewardId());
+                if (reward != null) {
+                    row.setLevelId(reward.getId());
+                    row.setLevelName(reward.getName());
+                    row.setRewardGold(reward.getRoomOwnerReward().doubleValue());
+                }
+            }
+        }
+        return pageResult;
+    }
+
+    /**
+     * 查询房间贡献明细
+     */
+    public PageResult<RoomDaySendRankRewardRecordAdminVo> pageRoomContribution(Integer partitionId, Long roomUid, 
+                                                                              String dateCycle, Integer pageNo, Integer pageSize) {
+        if (partitionId == null) {
+            throw new AdminServiceException("分区不能为空");
+        }
+
+        PartitionEnum partitionEnum = PartitionEnum.getByPartitionId(partitionId);
+        if (!partitionEnum.equals(PartitionEnum.ARAB)){
+            throw new AdminServiceException("该政策只在阿拉伯语区");
+        }
+
+        IPage<RoomDaySendRankRewardRecordAdminVo> iPage = new Page<>(pageNo, pageSize);
+        baseMapper.pageRoomContribution(iPage, partitionId, roomUid, dateCycle);
+
+        PageResult<RoomDaySendRankRewardRecordAdminVo> pageResult = new PageResult<>(iPage);
+        List<RoomDaySendRankRewardRecordAdminVo> rows = pageResult.getRows();
+        if (CollectionUtils.isEmpty(rows)) {
+            return pageResult;
+        }
+
+        Map<Long, RoomDaySendRankReward> rewardMap = new HashMap<>();
+        List<Long> rewardIds = rows.stream()
+                .filter(r -> r.getRewardId() != null)
+                .map(RoomDaySendRankRewardRecordAdminVo::getRewardId)
+                .toList();
+        
+        if (!rewardIds.isEmpty()) {
+            List<RoomDaySendRankReward> rewardList = roomDaySendRankRewardService.lambdaQuery()
+                    .in(RoomDaySendRankReward::getId, rewardIds)
+                    .list();
+            rewardMap.putAll(rewardList.stream().collect(
+                    java.util.stream.Collectors.toMap(RoomDaySendRankReward::getId, r -> r)));
+        }
+        
+        for (RoomDaySendRankRewardRecordAdminVo row : rows) {
+            if (row.getCreateTime() != null) {
+                row.setSendTime(DateUtil.formatDateTime(row.getCreateTime()));
+            }
+            
+            if (row.getRewardId() != null) {
+                RoomDaySendRankReward reward = rewardMap.get(row.getRewardId());
+                if (reward != null) {
+                    row.setLevelId(reward.getId());
+                    row.setLevelName(reward.getName());
+                    row.setRewardGold(reward.getRoomOwnerReward().doubleValue());
+                }
+            }
+        }
+        return pageResult;
+    }
+}

Users/yeung/IdeaProjects/peko-java/accompany-admin/accompany-admin-service/src/main/resources/accompany/sqlmappers/RoomDaySendRankRewardAdminMapper.xml

@@ -0,0 +1,96 @@
+<!-- ... existing code ... -->
+<mapper namespace="com.accompany.admin.mapper.room.RoomDaySendRankRewardAdminMapper">
+
+    <!-- ... existing select statement ... -->
+
+    <select id="pageRoomFlow" resultType="com.accompany.admin.vo.room.RoomDaySendRankRewardRecordAdminVo">
+        SELECT
+            gm.guild_id guildId,
+            owner.erban_no ownerErbanNo,
+            rn.room_uid roomUid,
+            rn.stat_date statDate,
+            rn.partition_id partitionId,
+            u.erban_no erbanNo,
+            rn.serial_value serialValue,
+            rn.reward_id rewardId,
+            rm.`title` roomName,
+            ri.`name` regionName,
+            rn.owner_receive_reward ownerReceiveReward,
+            au.username operator,
+            pi.`desc` partitionIdDesc,
+            (case when rn.owner_receive_reward is null or rn.owner_receive_reward = 0 then 1 else 2 end) `status`,
+            rn.receive_time createTime
+        FROM
+            room_day_send_rank_room_record rn
+        LEFT JOIN room rm on rn.room_uid = rm.uid
+        LEFT JOIN users u on u.uid = rn.room_uid
+        LEFT JOIN region_info ri on u.region_id = ri.id
+        left join guild_member gm on gm.uid = rn.room_uid and gm.`enable` = 1
+        left join guild g on g.id = gm.guild_id and g.`enable` = 1
+        left join users owner on owner.uid = g.owner_uid
+        left join admin_user au on au.id = rn.update_id
+        left join partition_info pi on rn.partition_id = pi.id
+        <where>
+            <if test="partitionId != null and partitionId != 0">
+                and rn.partition_id = #{partitionId}
+            </if>
+            <if test="regionId != null and regionId != 0">
+                and u.region_id = #{regionId}
+            </if>
+            <if test="roomUid != null">
+                and rn.room_uid = #{roomUid}
+            </if>
+            <if test="startDate != null and startDate != ''">
+                and rn.stat_date >= #{startDate}
+            </if>
+            <if test="endDate != null and endDate != ''">
+                and rn.stat_date <= #{endDate}
+            </if>
+            <choose>
+                <when test="status != null and status == 1">
+                    and (rn.owner_receive_reward is null or rn.owner_receive_reward = 0)
+                </when>
+                <when test="status != null and status == 2">
+                    and rn.owner_receive_reward > 0
+                </when>
+            </choose>
+        </where>
+        order by rn.stat_date desc, rn.serial_value desc, `status` asc
+    </select>
+
+    <select id="pageRoomContribution" resultType="com.accompany.admin.vo.room.RoomDaySendRankRewardRecordAdminVo">
+        SELECT
+            u.erban_no erbanNo,
+            u.nick nick,
+            u.avatar avatar,
+            u.region_id regionId,
+            ri.`name` regionName,
+            u.partition_id partitionId,
+            pi.`desc` partitionIdDesc,
+            rn.user_serial_value userSerialValue,
+            rn.user_reward_ratio userRewardRatio,
+            rn.user_reward userReward,
+            rn.user_receive_reward userReceiveReward,
+            rn.receive_time receiveTime,
+            rn.rank rank,
+            rn.type type,
+            rn.create_time createTime
+        FROM
+            room_day_send_rank_user_record rn
+        LEFT JOIN users u on u.uid = rn.uid
+        LEFT JOIN region_info ri on u.region_id = ri.id
+        LEFT JOIN partition_info pi on u.partition_id = pi.id
+        <where>
+            <if test="partitionId != null and partitionId != 0">
+                and rn.partition_id = #{partitionId}
+            </if>
+            <if test="roomUid != null">
+                and rn.room_uid = #{roomUid}
+            </if>
+            <if test="dateCycle != null and dateCycle != ''">
+                and rn.stat_date = #{dateCycle}
+            </if>
+        </where>
+        order by rn.user_serial_value desc, rn.rank asc
+    </select>
+</mapper>

Users/yeung/IdeaProjects/peko-java/accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/room/RoomDaySendRankRewardAdminController.java

@@ -0,0 +1,56 @@
+@RestController
+@RequestMapping("/admin/roomDaySendRankReward")
+@Api(tags = "房间日流水奖励管理", description = "房间日流水奖励相关接口")
+public class RoomDaySendRankRewardAdminController extends BaseController {
+
+    // ... existing fields ...
+
+    @ApiOperation(value = "每日流水奖励列表", httpMethod = "GET")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "partitionId", value = "分区id", required = true, dataType = "int"),
+            @ApiImplicitParam(name = "regionId", value = "国家id", required = false, dataType = "int"),
+            @ApiImplicitParam(name = "erbanNo", value = "用户id", required = false, dataType = "long"),
+            @ApiImplicitParam(name = "ownerErbanNo", value = "公会长ID", required = false, dataType = "long"),
+            @ApiImplicitParam(name = "guildId", value = "公会id", required = false, dataType = "int"),
+            @ApiImplicitParam(name = "dateCycle", value = "周期", required = false, dataType = "string"),
+            @ApiImplicitParam(name = "status", value = "发放状态：-1:全部,1:未发放，2已经发放", required = false, dataType = "int"),
+    })
+    @GetMapping("/page")
+    public BusiResult<PageResult<RoomDaySendRankRewardRecordAdminVo>> page(Long erbanNo, Long ownerErbanNo, Integer guildId, String dateCycle, Integer status, BasePageParams pageParams) {
+
+        PageResult<RoomDaySendRankRewardRecordAdminVo> pageResult = roomDaySendRankRewardAdminService.pageRecord(pageParams.getPartitionId(), pageParams.getRegionId(), erbanNo, ownerErbanNo, guildId, dateCycle,
+                status, pageParams.getPageNo(), pageParams.getPageSize());
+        return BusiResult.success(pageResult);
+    }
+
+    @ApiOperation(value = "房间流水记录查询", httpMethod = "GET")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "partitionId", value = "分区id", required = true, dataType = "int"),
+            @ApiImplicitParam(name = "regionId", value = "国家id", required = false, dataType = "int"),
+            @ApiImplicitParam(name = "roomUid", value = "房间UID", required = false, dataType = "long"),
+            @ApiImplicitParam(name = "startDate", value = "开始时间", required = false, dataType = "string"),
+            @ApiImplicitParam(name = "endDate", value = "结束时间", required = false, dataType = "string"),
+            @ApiImplicitParam(name = "status", value = "发放状态：1:未发放，2已经发放", required = false, dataType = "int"),
+    })
+    @GetMapping("/roomFlow/page")
+    public BusiResult<PageResult<RoomDaySendRankRewardRecordAdminVo>> roomFlowPage(Integer regionId, Long roomUid, String startDate, String endDate, Integer status, BasePageParams pageParams) {
+        PageResult<RoomDaySendRankRewardRecordAdminVo> pageResult = roomDaySendRankRewardAdminService.pageRoomFlow(pageParams.getPartitionId(), regionId, roomUid, startDate, endDate, status,
+                pageParams.getPageNo(), pageParams.getPageSize());
+        return BusiResult.success(pageResult);
+    }
+
+    @ApiOperation(value = "房间贡献明细查询", httpMethod = "GET")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "partitionId", value = "分区id", required = true, dataType = "int"),
+            @ApiImplicitParam(name = "roomUid", value = "房间UID", required = true, dataType = "long"),
+            @ApiImplicitParam(name = "dateCycle", value = "统计日期", required = true, dataType = "string"),
+    })
+    @GetMapping("/roomContribution/page")
+    public BusiResult<PageResult<RoomDaySendRankRewardRecordAdminVo>> roomContributionPage(Long roomUid, String dateCycle, BasePageParams pageParams) {
+        PageResult<RoomDaySendRankRewardRecordAdminVo> pageResult = roomDaySendRankRewardAdminService.pageRoomContribution(pageParams.getPartitionId(), roomUid, dateCycle,
+                pageParams.getPageNo(), pageParams.getPageSize());
+        return BusiResult.success(pageResult);
+    }
+
+    // ... existing methods ...
+}

accompany-admin/accompany-admin-sdk/pom.xml

@@ -48,11 +48,6 @@
             <artifactId>accompany-business-sdk</artifactId>
             <version>${revision}</version>
         </dependency>
-        <dependency>
-            <groupId>com.accompany</groupId>
-            <artifactId>xuanyin-flow-team-sdk</artifactId>
-            <version>${revision}</version>
-        </dependency>
     </dependencies>
 
 </project>

accompany-admin/accompany-admin-sdk/src/main/java/com/accompany/admin/dto/ChannelDistributeSearchDto.java

@@ -1,24 +0,0 @@
-package com.accompany.admin.dto;
-
-import lombok.Data;
-
-import java.util.Date;
-
-/**
- * ｛这里添加描述｝
- *
- * @author fangchengyan
- * @date 2020-02-20 2:49 下午
- */
-@Data
-public class ChannelDistributeSearchDto {
-
-    private String appId;
-
-    private String channel;
-
-    private Date startTime;
-
-    private Date endTime;
-
-}

accompany-admin/accompany-admin-sdk/src/main/java/com/accompany/admin/dto/TarotChargeRecordDTO.java

@@ -1,24 +0,0 @@
-package com.accompany.admin.dto;
-
-import com.accompany.payment.vo.TarotRecordTotalVo;
-import com.github.pagehelper.PageInfo;
-import lombok.AllArgsConstructor;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-
-/**
- * @Author: yangming
- * @Date: 2019/11/14 17:19
- * @Description: 塔罗充值统计数据对象
- **/
-@Data
-@NoArgsConstructor
-@AllArgsConstructor
-public class TarotChargeRecordDTO {
-
-    /** 分页对象 */
-    private PageInfo<TarotRecordTotalVo> pageInfo;
-
-    /** 总的记录相加 */
-    private TarotRecordTotalVo tarotRecordTotalVo;
-}

accompany-admin/accompany-admin-sdk/src/main/java/com/accompany/admin/dto/TopLineRequestDto.java

@@ -1,106 +0,0 @@
-package com.accompany.admin.dto;
-
-import java.util.Date;
-
-/**
- * 后台 头条数据
- */
-public class TopLineRequestDto {
-
-	private Long id;
-
-	private String title;
-
-	// 0 是没有跳转 1是跳转链接 2是房间id
-	private Integer paramType;
-
-	private String params;
-
-	/**
-	 * 图片 路径
-	 */
-	private String img;
-
-	/**
-	 * 是否发布
-	 */
-	private Boolean publish = false;
-
-	/**
-	 * 发布时间
-	 */
-	private Long publishTime;
-	
-	/**
-	 * 发布时间
-	 */
-	private Date publishTimeDate;
-
-	public Long getId() {
-		return id;
-	}
-
-	public void setId(Long id) {
-		this.id = id;
-	}
-
-	public String getTitle() {
-		return title;
-	}
-
-	public void setTitle(String title) {
-		this.title = title;
-	}
-
-	public String getImg() {
-		return img;
-	}
-
-	public void setImg(String img) {
-		this.img = img;
-	}
-
-
-	public boolean isPublish() {
-		return publish;
-	}
-
-	public void setPublish(boolean publish) {
-		this.publish = publish;
-	}
-
-	public Long getPublishTime() {
-		return publishTime;
-	}
-
-	public void setPublishTime(Long publishTime) {
-		this.publishTime = publishTime;
-	}
-
-	public Integer getParamType() {
-		return paramType;
-	}
-
-	public void setParamType(Integer paramType) {
-		this.paramType = paramType;
-	}
-
-	public String getParams() {
-		return params;
-	}
-
-	public void setParams(String params) {
-		this.params = params;
-	}
-
-	public Date getPublishTimeDate() {
-		return publishTimeDate;
-	}
-
-	public void setPublishTimeDate(Date publishTimeDate) {
-		this.publishTimeDate = publishTimeDate;
-	}
-	
-	
-
-}

accompany-admin/accompany-admin-sdk/src/main/java/com/accompany/admin/dto/batch/FlowDataBatchSearchDetailAdminDto.java

@@ -1,159 +0,0 @@
-package com.accompany.admin.dto.batch;
-
-import com.alibaba.excel.annotation.ExcelProperty;
-import lombok.Data;
-
-import java.math.BigDecimal;
-
-/**
- * @author: liaozetao
- * @date: 2023/9/22 18:36
- * @description:
- */
-@Data
-public class FlowDataBatchSearchDetailAdminDto {
-
-    /**
-     * 新增时间
-     */
-    @ExcelProperty("新增时间")
-    private String signUpTimeStr;
-
-    /**
-     * 新增归因ID
-     */
-    @ExcelProperty("新增归因ID")
-    private Long erBanNo;
-
-    /**
-     * 用户昵称
-     */
-    @ExcelProperty("用户昵称")
-    private String nick;
-
-    /**
-     * 是否进归因房
-     */
-    @ExcelProperty("是否进归因房")
-    private String isInRoomStr = "否";
-
-    /**
-     * 设备号
-     */
-    @ExcelProperty("设备号")
-    private String deviceId;
-
-    /**
-     * 是否为新设备
-     */
-    @ExcelProperty("是否为新设备")
-    private String isNewDevice = "是";
-
-    /**
-     * 活动期间私聊行为数
-     */
-    @ExcelProperty("活动期间私聊行为数")
-    private Integer chatCount = 0;
-
-    /**
-     * 新增当天充值
-     */
-    @ExcelProperty("新增当天充值")
-    private BigDecimal chargeAmount = BigDecimal.ZERO;
-
-    /**
-     * 3天充值
-     */
-    @ExcelProperty("3天充值")
-    private BigDecimal threeChargeAmount = BigDecimal.ZERO;
-
-    /**
-     * 7天充值
-     */
-    @ExcelProperty("7天充值")
-    private BigDecimal sevenChargeAmount = BigDecimal.ZERO;
-
-    /**
-     * 15天充值
-     */
-    @ExcelProperty("15天充值")
-    private BigDecimal fifteenChargeAmount = BigDecimal.ZERO;
-
-    /**
-     * 30天充值
-     */
-    @ExcelProperty("30天充值")
-    private BigDecimal thirtyChargeAmount = BigDecimal.ZERO;
-
-    /**
-     * 新增当天收到转赠
-     */
-    @ExcelProperty("新增当天收到转赠")
-    private BigDecimal giveDiamondNum = BigDecimal.ZERO;
-
-    /**
-     * 3天收到转赠
-     */
-    @ExcelProperty("3天收到转赠")
-    private BigDecimal threeGiveDiamondNum = BigDecimal.ZERO;
-
-    /**
-     * 7天收到转赠
-     */
-    @ExcelProperty("7天收到转赠")
-    private BigDecimal sevenGiveDiamondNum = BigDecimal.ZERO;
-
-    /**
-     * 15天收到转赠
-     */
-    @ExcelProperty("15天收到转赠")
-    private BigDecimal fifteenGiveDiamondNum = BigDecimal.ZERO;
-
-    /**
-     * 30天收到转赠
-     */
-    @ExcelProperty("30天收到转赠")
-    private BigDecimal thirtyGiveDiamondNum = BigDecimal.ZERO;
-
-    /**
-     * 累计充值
-     */
-    @ExcelProperty("累计充值")
-    private BigDecimal totalChargeAmount = BigDecimal.ZERO;
-
-    /**
-     * 累计接受转赠钻石
-     */
-    @ExcelProperty("累计接受转赠钻石")
-    private BigDecimal totalGiveDiamondNum = BigDecimal.ZERO;
-
-    /**
-     * 次日是否访问
-     */
-    @ExcelProperty("次日是否访问")
-    private Integer isRemain = 0;
-
-    /**
-     * 第3日是否访问
-     */
-    @ExcelProperty("第3日是否访问")
-    private Integer isThreeRemain = 0;
-
-    /**
-     * 第7日是否访问
-     */
-    @ExcelProperty("第7日是否访问")
-    private Integer isSevenRemain = 0;
-
-    /**
-     * 第15日是否访问
-     */
-    @ExcelProperty("第15日是否访问")
-    private Integer isFifteenRemain = 0;
-
-    /**
-     * 第30日是否访问
-     */
-    @ExcelProperty("第30日是否访问")
-    private Integer isThirtyRemain = 0;
-}

accompany-admin/accompany-admin-sdk/src/main/java/com/accompany/admin/dto/batch/FlowDataBatchSearchGrowAdminDto.java

@@ -1,64 +0,0 @@
-package com.accompany.admin.dto.batch;
-
-import com.alibaba.excel.annotation.ExcelProperty;
-import io.swagger.annotations.ApiModel;
-import lombok.Data;
-
-/**
- * @author: liaozetao
- * @date: 2023/9/23 16:07
- * @description:
- */
-@Data
-@ApiModel
-public class FlowDataBatchSearchGrowAdminDto {
-
-
-    /**
-     * 统计项
-     */
-    @ExcelProperty("统计项")
-    private String countItem;
-
-    /**
-     * 当天情况
-     */
-    @ExcelProperty("当天情况")
-    private String currCondition;
-
-    /**
-     * 次日情况
-     */
-    @ExcelProperty("次日情况")
-    private String nextCondition;
-
-    /**
-     * 3日情况
-     */
-    @ExcelProperty("3日情况")
-    private String threeCondition;
-
-    /**
-     * 7日情况
-     */
-    @ExcelProperty("7日情况")
-    private String sevenCondition;
-
-    /**
-     * 15日情况
-     */
-    @ExcelProperty("15日情况")
-    private String fifteenCondition;
-
-    /**
-     * 30日情况
-     */
-    @ExcelProperty("30日情况")
-    private String thirtyCondition;
-
-    /**
-     * 累计到目前
-     */
-    @ExcelProperty("累计到目前")
-    private String totalCondition;
-}

accompany-admin/accompany-admin-sdk/src/main/java/com/accompany/admin/dto/gamepartner/GamePartnerOrderAdminDto.java

@@ -1,76 +0,0 @@
-package com.accompany.admin.dto.gamepartner;
-
-import com.alibaba.excel.annotation.ExcelProperty;
-import lombok.Data;
-
-import java.math.BigDecimal;
-
-/**
- * @author: liaozetao
- * @date: 2023/8/24 16:51
- * @description:
- */
-@Data
-public class GamePartnerOrderAdminDto {
-
-    /**
-     * 订单号
-     */
-    @ExcelProperty("订单号")
-    private String orderNo;
-
-    /**
-     * 下单用户id
-     */
-    @ExcelProperty("下单用户id")
-    private Long fromErBanNo;
-
-    /**
-     * 下单用户昵称
-     */
-    @ExcelProperty("下单用户昵称")
-    private String fromNick;
-
-    /**
-     * 接单用户id
-     */
-    @ExcelProperty("接单用户id")
-    private Long toErBanNo;
-
-    /**
-     * 接单用户昵称
-     */
-    @ExcelProperty("接单用户昵称")
-    private String toNick;
-
-    /**
-     * 接单用户收益（水晶）
-     */
-    @ExcelProperty("接单用户收益（水晶）")
-    private BigDecimal income;
-
-    /**
-     * 下单游戏
-     */
-    @ExcelProperty("下单游戏")
-    private String gameName;
-
-    /**
-     * 下单局数
-     */
-    @ExcelProperty("下单局数")
-    private Integer inning;
-
-    /**
-     * 下单金额
-     */
-    @ExcelProperty("下单金额")
-    private BigDecimal amount;
-
-    /**
-     * 下单时间
-     */
-    @ExcelProperty("下单时间")
-    private String orderTime;
-
-}

accompany-admin/accompany-admin-sdk/src/main/java/com/accompany/admin/dto/treasure/SeizeTreasureRecordDto.java

@@ -1,79 +0,0 @@
-package com.accompany.admin.dto.treasure;
-
-import com.alibaba.excel.annotation.ExcelProperty;
-import lombok.Data;
-
-/**
- * @author: liaozetao
- * @date: 2023/10/25 16:57
- * @description:
- */
-@Data
-public class SeizeTreasureRecordDto {
-
-    /**
-     * ID
-     */
-    @ExcelProperty("ID")
-    private Long id;
-
-    /**
-     * 平台号
-     */
-    @ExcelProperty("平台号")
-    private Long erbanNo;
-
-    /**
-     * 昵称
-     */
-    @ExcelProperty("昵称")
-    private String userNick;
-
-    /**
-     * 奖励ID
-     */
-    @ExcelProperty("奖励ID")
-    private Long rewardId;
-
-    /**
-     * 奖励关联ID
-     */
-    @ExcelProperty("奖励关联ID")
-    private Long rewardRefId;
-
-    /**
-     * 奖励类型
-     */
-    @ExcelProperty("奖励类型")
-    private String rewardType;
-
-    /**
-     * 奖励名称
-     */
-    @ExcelProperty("奖励名称")
-    private String rewardName;
-
-    /**
-     * 奖励数量
-     */
-    @ExcelProperty("奖励数量")
-    private Integer rewardNum;
-
-    /**
-     * 奖励等级
-     */
-    @ExcelProperty("奖励等级")
-    private Integer rewardLevel;
-
-    /**
-     * 奖励价值
-     */
-    @ExcelProperty("奖励价值")
-    private Integer rewardShowValue;
-
-    /**
-     * 抽奖时间
-     */
-    @ExcelProperty("抽奖时间")
-    private String createTimeStr;
-}

accompany-admin/accompany-admin-sdk/src/main/java/com/accompany/admin/dto/treasure/SeizeTreasureUserPropRecordAdminDto.java

@@ -1,43 +0,0 @@
-package com.accompany.admin.dto.treasure;
-
-import com.alibaba.excel.annotation.ExcelProperty;
-import lombok.Data;
-
-/**
- * @author: liaozetao
- * @date: 2023/9/7 16:55
- * @description:
- */
-@Data
-public class SeizeTreasureUserPropRecordAdminDto {
-
-    /**
-     * 用户ID
-     */
-    @ExcelProperty("用户ID")
-    private Long erbanNo;
-
-    /**
-     * 昵称
-     */
-    @ExcelProperty("昵称")
-    private String nick;
-
-    /**
-     * 试炼素材
-     */
-    @ExcelProperty("试炼素材")
-    private String expendStr;
-
-    /**
-     * 试炼产出
-     */
-    @ExcelProperty("试炼产出")
-    private String propName;
-
-    /**
-     * 试炼时间
-     */
-    @ExcelProperty("试炼时间")
-    private String createTimeStr;
-}

accompany-admin/accompany-admin-sdk/src/main/java/com/accompany/admin/dto/withdraw/WithdrawUserAdminDto.java

@@ -1,39 +0,0 @@
-package com.accompany.admin.dto.withdraw;
-
-import com.alibaba.excel.annotation.ExcelProperty;
-import lombok.Data;
-
-/**
- * @author: liaozetao
- * @date: 2023/7/13 17:20
- * @description:
- */
-@Data
-public class WithdrawUserAdminDto {
-
-
-    /**
-     * 耳伴号
-     */
-    @ExcelProperty("Peko号")
-    private Long erbanNo;
-
-    /**
-     * 昵称
-     */
-    @ExcelProperty("昵称")
-    private String nick;
-
-    /**
-     * 创建时间
-     */
-    @ExcelProperty("首次绑定时间")
-    private String createTimeStr;
-
-    /**
-     * 提现账户
-     */
-    @ExcelProperty("提现账户")
-    private String withdrawAccount;
-
-}

accompany-admin/accompany-admin-sdk/src/main/java/com/accompany/admin/dto/withdraw/WithdrawUserLimitAdminDto.java

@@ -1,22 +0,0 @@
-package com.accompany.admin.dto.withdraw;
-
-import com.accompany.business.model.withdraw.WithdrawUserLimit;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-/**
- * @author: liaozetao
- * @date: 2023/7/10 18:40
- * @description:
- */
-@Data
-@ApiModel
-public class WithdrawUserLimitAdminDto extends WithdrawUserLimit {
-
-    /**
-     * 耳伴号
-     */
-    @ApiModelProperty("耳伴号")
-    private String erbanNo;
-}

accompany-admin/accompany-admin-sdk/src/main/java/com/accompany/admin/dto/withdraw/WithdrawUserLimitExportDto.java

@@ -1,68 +0,0 @@
-package com.accompany.admin.dto.withdraw;
-
-import com.alibaba.excel.annotation.ExcelProperty;
-import lombok.Data;
-
-/**
- * @author: liaozetao
- * @date: 2023/8/3 19:16
- * @description:
- */
-@Data
-public class WithdrawUserLimitExportDto {
-
-
-    /**
-     * Peko号
-     */
-    @ExcelProperty("Peko号")
-    private Long erbanNo;
-
-    /**
-     * 昵称
-     */
-    @ExcelProperty("昵称")
-    private String nick;
-
-    /**
-     * 所属房间
-     */
-    @ExcelProperty("所属房间")
-    private String roomName;
-
-    /**
-     * 所属房间ID
-     */
-    @ExcelProperty("所属房间ID")
-    private Long roomErBanNo;
-
-    /**
-     * 所属公会
-     */
-    @ExcelProperty("所属公会")
-    private String hallRoomName;
-
-    /**
-     * 所属公会ID
-     */
-    @ExcelProperty("所属公会ID")
-    private Long hallErBanNo;
-
-    /**
-     * 当前账户金币余额
-     */
-    @ExcelProperty("当前账户金币余额")
-    private Double golds;
-
-    /**
-     * 限制内容
-     */
-    @ExcelProperty("限制内容")
-    private String limitContent;
-
-    /**
-     * 限制时间
-     */
-    @ExcelProperty("限制时间")
-    private String limitTimeStr;
-}

accompany-admin/accompany-admin-sdk/src/main/java/com/accompany/admin/dto/withdraw/WithdrawUserRecordAdminDto.java

@@ -1,75 +0,0 @@
-package com.accompany.admin.dto.withdraw;
-
-import com.alibaba.excel.annotation.ExcelProperty;
-import lombok.Data;
-
-import java.math.BigDecimal;
-
-/**
- * @author: liaozetao
- * @date: 2023/7/13 17:12
- * @description:
- */
-@Data
-public class WithdrawUserRecordAdminDto {
-
-    /**
-     * 平台号
-     */
-    @ExcelProperty("Peko号")
-    private String erbanNo;
-
-    /**
-     * 昵称
-     */
-    @ExcelProperty("昵称")
-    private String nick;
-
-    /**
-     * 用户当前状态
-     */
-    @ExcelProperty("用户当前状态")
-    private String blockStatusName;
-
-    /**
-     * 创建时间
-     */
-    @ExcelProperty("申请时间")
-    private String createTimeStr;
-
-    /**
-     * 提现账户
-     */
-    @ExcelProperty("提现账户")
-    private String accountName;
-
-    /**
-     * 提现金额
-     */
-    @ExcelProperty("提现金额USD")
-    private BigDecimal cashAmount;
-
-    /**
-     * 币种类型
-     */
-    @ExcelProperty("发放币种")
-    private String currency;
-
-    /**
-     * 币种金额
-     */
-    @ExcelProperty("发放金额")
-    private BigDecimal currencyAmount;
-
-    /**
-     * 手续费
-     */
-    @ExcelProperty("手续费")
-    private String handlingRateStr;
-
-    /**
-     * 金币数量
-     */
-    @ExcelProperty("核销金币")
-    private Integer goldNum;
-}

accompany-admin/accompany-admin-sdk/src/main/java/com/accompany/admin/model/AdminDict.java

@@ -1,55 +0,0 @@
-package com.accompany.admin.model;
-
-import java.util.Date;
-
-public class AdminDict extends AdminDictKey {
-    private String dictval;
-
-    private Boolean status;
-
-    private Integer showorder;
-
-    private Date createtime;
-
-    private String description;
-
-    public String getDictval() {
-        return dictval;
-    }
-
-    public void setDictval(String dictval) {
-        this.dictval = dictval == null ? null : dictval.trim();
-    }
-
-    public Boolean getStatus() {
-        return status;
-    }
-
-    public void setStatus(Boolean status) {
-        this.status = status;
-    }
-
-    public Integer getShoworder() {
-        return showorder;
-    }
-
-    public void setShoworder(Integer showorder) {
-        this.showorder = showorder;
-    }
-
-    public Date getCreatetime() {
-        return createtime;
-    }
-
-    public void setCreatetime(Date createtime) {
-        this.createtime = createtime;
-    }
-
-    public String getDescription() {
-        return description;
-    }
-
-    public void setDescription(String description) {
-        this.description = description == null ? null : description.trim();
-    }
-}

accompany-admin/accompany-admin-sdk/src/main/java/com/accompany/admin/model/AdminDictExample.java

@@ -1,661 +0,0 @@
-package com.accompany.admin.model;
-
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.List;
-
-public class AdminDictExample {
-    protected String orderByClause;
-
-    protected boolean distinct;
-
-    protected List<Criteria> oredCriteria;
-
-    public AdminDictExample() {
-        oredCriteria = new ArrayList<Criteria>();
-    }
-
-    public void setOrderByClause(String orderByClause) {
-        this.orderByClause = orderByClause;
-    }
-
-    public String getOrderByClause() {
-        return orderByClause;
-    }
-
-    public void setDistinct(boolean distinct) {
-        this.distinct = distinct;
-    }
-
-    public boolean isDistinct() {
-        return distinct;
-    }
-
-    public List<Criteria> getOredCriteria() {
-        return oredCriteria;
-    }
-
-    public void or(Criteria criteria) {
-        oredCriteria.add(criteria);
-    }
-
-    public Criteria or() {
-        Criteria criteria = createCriteriaInternal();
-        oredCriteria.add(criteria);
-        return criteria;
-    }
-
-    public Criteria createCriteria() {
-        Criteria criteria = createCriteriaInternal();
-        if (oredCriteria.size() == 0) {
-            oredCriteria.add(criteria);
-        }
-        return criteria;
-    }
-
-    protected Criteria createCriteriaInternal() {
-        Criteria criteria = new Criteria();
-        return criteria;
-    }
-
-    public void clear() {
-        oredCriteria.clear();
-        orderByClause = null;
-        distinct = false;
-    }
-
-    protected abstract static class GeneratedCriteria {
-        protected List<Criterion> criteria;
-
-        protected GeneratedCriteria() {
-            super();
-            criteria = new ArrayList<Criterion>();
-        }
-
-        public boolean isValid() {
-            return criteria.size() > 0;
-        }
-
-        public List<Criterion> getAllCriteria() {
-            return criteria;
-        }
-
-        public List<Criterion> getCriteria() {
-            return criteria;
-        }
-
-        protected void addCriterion(String condition) {
-            if (condition == null) {
-                throw new RuntimeException("Value for condition cannot be null");
-            }
-            criteria.add(new Criterion(condition));
-        }
-
-        protected void addCriterion(String condition, Object value, String property) {
-            if (value == null) {
-                throw new RuntimeException("Value for " + property + " cannot be null");
-            }
-            criteria.add(new Criterion(condition, value));
-        }
-
-        protected void addCriterion(String condition, Object value1, Object value2, String property) {
-            if (value1 == null || value2 == null) {
-                throw new RuntimeException("Between values for " + property + " cannot be null");
-            }
-            criteria.add(new Criterion(condition, value1, value2));
-        }
-
-        public Criteria andCodeIsNull() {
-            addCriterion("code is null");
-            return (Criteria) this;
-        }
-
-        public Criteria andCodeIsNotNull() {
-            addCriterion("code is not null");
-            return (Criteria) this;
-        }
-
-        public Criteria andCodeEqualTo(String value) {
-            addCriterion("code =", value, "code");
-            return (Criteria) this;
-        }
-
-        public Criteria andCodeNotEqualTo(String value) {
-            addCriterion("code <>", value, "code");
-            return (Criteria) this;
-        }
-
-        public Criteria andCodeGreaterThan(String value) {
-            addCriterion("code >", value, "code");
-            return (Criteria) this;
-        }
-
-        public Criteria andCodeGreaterThanOrEqualTo(String value) {
-            addCriterion("code >=", value, "code");
-            return (Criteria) this;
-        }
-
-        public Criteria andCodeLessThan(String value) {
-            addCriterion("code <", value, "code");
-            return (Criteria) this;
-        }
-
-        public Criteria andCodeLessThanOrEqualTo(String value) {
-            addCriterion("code <=", value, "code");
-            return (Criteria) this;
-        }
-
-        public Criteria andCodeLike(String value) {
-            addCriterion("code like", value, "code");
-            return (Criteria) this;
-        }
-
-        public Criteria andCodeNotLike(String value) {
-            addCriterion("code not like", value, "code");
-            return (Criteria) this;
-        }
-
-        public Criteria andCodeIn(List<String> values) {
-            addCriterion("code in", values, "code");
-            return (Criteria) this;
-        }
-
-        public Criteria andCodeNotIn(List<String> values) {
-            addCriterion("code not in", values, "code");
-            return (Criteria) this;
-        }
-
-        public Criteria andCodeBetween(String value1, String value2) {
-            addCriterion("code between", value1, value2, "code");
-            return (Criteria) this;
-        }
-
-        public Criteria andCodeNotBetween(String value1, String value2) {
-            addCriterion("code not between", value1, value2, "code");
-            return (Criteria) this;
-        }
-
-        public Criteria andDictkeyIsNull() {
-            addCriterion("dictkey is null");
-            return (Criteria) this;
-        }
-
-        public Criteria andDictkeyIsNotNull() {
-            addCriterion("dictkey is not null");
-            return (Criteria) this;
-        }
-
-        public Criteria andDictkeyEqualTo(String value) {
-            addCriterion("dictkey =", value, "dictkey");
-            return (Criteria) this;
-        }
-
-        public Criteria andDictkeyNotEqualTo(String value) {
-            addCriterion("dictkey <>", value, "dictkey");
-            return (Criteria) this;
-        }
-
-        public Criteria andDictkeyGreaterThan(String value) {
-            addCriterion("dictkey >", value, "dictkey");
-            return (Criteria) this;
-        }
-
-        public Criteria andDictkeyGreaterThanOrEqualTo(String value) {
-            addCriterion("dictkey >=", value, "dictkey");
-            return (Criteria) this;
-        }
-
-        public Criteria andDictkeyLessThan(String value) {
-            addCriterion("dictkey <", value, "dictkey");
-            return (Criteria) this;
-        }
-
-        public Criteria andDictkeyLessThanOrEqualTo(String value) {
-            addCriterion("dictkey <=", value, "dictkey");
-            return (Criteria) this;
-        }
-
-        public Criteria andDictkeyLike(String value) {
-            addCriterion("dictkey like", value, "dictkey");
-            return (Criteria) this;
-        }
-
-        public Criteria andDictkeyNotLike(String value) {
-            addCriterion("dictkey not like", value, "dictkey");
-            return (Criteria) this;
-        }
-
-        public Criteria andDictkeyIn(List<String> values) {
-            addCriterion("dictkey in", values, "dictkey");
-            return (Criteria) this;
-        }
-
-        public Criteria andDictkeyNotIn(List<String> values) {
-            addCriterion("dictkey not in", values, "dictkey");
-            return (Criteria) this;
-        }
-
-        public Criteria andDictkeyBetween(String value1, String value2) {
-            addCriterion("dictkey between", value1, value2, "dictkey");
-            return (Criteria) this;
-        }
-
-        public Criteria andDictkeyNotBetween(String value1, String value2) {
-            addCriterion("dictkey not between", value1, value2, "dictkey");
-            return (Criteria) this;
-        }
-
-        public Criteria andDictvalIsNull() {
-            addCriterion("dictval is null");
-            return (Criteria) this;
-        }
-
-        public Criteria andDictvalIsNotNull() {
-            addCriterion("dictval is not null");
-            return (Criteria) this;
-        }
-
-        public Criteria andDictvalEqualTo(String value) {
-            addCriterion("dictval =", value, "dictval");
-            return (Criteria) this;
-        }
-
-        public Criteria andDictvalNotEqualTo(String value) {
-            addCriterion("dictval <>", value, "dictval");
-            return (Criteria) this;
-        }
-
-        public Criteria andDictvalGreaterThan(String value) {
-            addCriterion("dictval >", value, "dictval");
-            return (Criteria) this;
-        }
-
-        public Criteria andDictvalGreaterThanOrEqualTo(String value) {
-            addCriterion("dictval >=", value, "dictval");
-            return (Criteria) this;
-        }
-
-        public Criteria andDictvalLessThan(String value) {
-            addCriterion("dictval <", value, "dictval");
-            return (Criteria) this;
-        }
-
-        public Criteria andDictvalLessThanOrEqualTo(String value) {
-            addCriterion("dictval <=", value, "dictval");
-            return (Criteria) this;
-        }
-
-        public Criteria andDictvalLike(String value) {
-            addCriterion("dictval like", value, "dictval");
-            return (Criteria) this;
-        }
-
-        public Criteria andDictvalNotLike(String value) {
-            addCriterion("dictval not like", value, "dictval");
-            return (Criteria) this;
-        }
-
-        public Criteria andDictvalIn(List<String> values) {
-            addCriterion("dictval in", values, "dictval");
-            return (Criteria) this;
-        }
-
-        public Criteria andDictvalNotIn(List<String> values) {
-            addCriterion("dictval not in", values, "dictval");
-            return (Criteria) this;
-        }
-
-        public Criteria andDictvalBetween(String value1, String value2) {
-            addCriterion("dictval between", value1, value2, "dictval");
-            return (Criteria) this;
-        }
-
-        public Criteria andDictvalNotBetween(String value1, String value2) {
-            addCriterion("dictval not between", value1, value2, "dictval");
-            return (Criteria) this;
-        }
-
-        public Criteria andStatusIsNull() {
-            addCriterion("status is null");
-            return (Criteria) this;
-        }
-
-        public Criteria andStatusIsNotNull() {
-            addCriterion("status is not null");
-            return (Criteria) this;
-        }
-
-        public Criteria andStatusEqualTo(Boolean value) {
-            addCriterion("status =", value, "status");
-            return (Criteria) this;
-        }
-
-        public Criteria andStatusNotEqualTo(Boolean value) {
-            addCriterion("status <>", value, "status");
-            return (Criteria) this;
-        }
-
-        public Criteria andStatusGreaterThan(Boolean value) {
-            addCriterion("status >", value, "status");
-            return (Criteria) this;
-        }
-
-        public Criteria andStatusGreaterThanOrEqualTo(Boolean value) {
-            addCriterion("status >=", value, "status");
-            return (Criteria) this;
-        }
-
-        public Criteria andStatusLessThan(Boolean value) {
-            addCriterion("status <", value, "status");
-            return (Criteria) this;
-        }
-
-        public Criteria andStatusLessThanOrEqualTo(Boolean value) {
-            addCriterion("status <=", value, "status");
-            return (Criteria) this;
-        }
-
-        public Criteria andStatusIn(List<Boolean> values) {
-            addCriterion("status in", values, "status");
-            return (Criteria) this;
-        }
-
-        public Criteria andStatusNotIn(List<Boolean> values) {
-            addCriterion("status not in", values, "status");
-            return (Criteria) this;
-        }
-
-        public Criteria andStatusBetween(Boolean value1, Boolean value2) {
-            addCriterion("status between", value1, value2, "status");
-            return (Criteria) this;
-        }
-
-        public Criteria andStatusNotBetween(Boolean value1, Boolean value2) {
-            addCriterion("status not between", value1, value2, "status");
-            return (Criteria) this;
-        }
-
-        public Criteria andShoworderIsNull() {
-            addCriterion("showOrder is null");
-            return (Criteria) this;
-        }
-
-        public Criteria andShoworderIsNotNull() {
-            addCriterion("showOrder is not null");
-            return (Criteria) this;
-        }
-
-        public Criteria andShoworderEqualTo(Integer value) {
-            addCriterion("showOrder =", value, "showorder");
-            return (Criteria) this;
-        }
-
-        public Criteria andShoworderNotEqualTo(Integer value) {
-            addCriterion("showOrder <>", value, "showorder");
-            return (Criteria) this;
-        }
-
-        public Criteria andShoworderGreaterThan(Integer value) {
-            addCriterion("showOrder >", value, "showorder");
-            return (Criteria) this;
-        }
-
-        public Criteria andShoworderGreaterThanOrEqualTo(Integer value) {
-            addCriterion("showOrder >=", value, "showorder");
-            return (Criteria) this;
-        }
-
-        public Criteria andShoworderLessThan(Integer value) {
-            addCriterion("showOrder <", value, "showorder");
-            return (Criteria) this;
-        }
-
-        public Criteria andShoworderLessThanOrEqualTo(Integer value) {
-            addCriterion("showOrder <=", value, "showorder");
-            return (Criteria) this;
-        }
-
-        public Criteria andShoworderIn(List<Integer> values) {
-            addCriterion("showOrder in", values, "showorder");
-            return (Criteria) this;
-        }
-
-        public Criteria andShoworderNotIn(List<Integer> values) {
-            addCriterion("showOrder not in", values, "showorder");
-            return (Criteria) this;
-        }
-
-        public Criteria andShoworderBetween(Integer value1, Integer value2) {
-            addCriterion("showOrder between", value1, value2, "showorder");
-            return (Criteria) this;
-        }
-
-        public Criteria andShoworderNotBetween(Integer value1, Integer value2) {
-            addCriterion("showOrder not between", value1, value2, "showorder");
-            return (Criteria) this;
-        }
-
-        public Criteria andCreatetimeIsNull() {
-            addCriterion("createTime is null");
-            return (Criteria) this;
-        }
-
-        public Criteria andCreatetimeIsNotNull() {
-            addCriterion("createTime is not null");
-            return (Criteria) this;
-        }
-
-        public Criteria andCreatetimeEqualTo(Date value) {
-            addCriterion("createTime =", value, "createtime");
-            return (Criteria) this;
-        }
-
-        public Criteria andCreatetimeNotEqualTo(Date value) {
-            addCriterion("createTime <>", value, "createtime");
-            return (Criteria) this;
-        }
-
-        public Criteria andCreatetimeGreaterThan(Date value) {
-            addCriterion("createTime >", value, "createtime");
-            return (Criteria) this;
-        }
-
-        public Criteria andCreatetimeGreaterThanOrEqualTo(Date value) {
-            addCriterion("createTime >=", value, "createtime");
-            return (Criteria) this;
-        }
-
-        public Criteria andCreatetimeLessThan(Date value) {
-            addCriterion("createTime <", value, "createtime");
-            return (Criteria) this;
-        }
-
-        public Criteria andCreatetimeLessThanOrEqualTo(Date value) {
-            addCriterion("createTime <=", value, "createtime");
-            return (Criteria) this;
-        }
-
-        public Criteria andCreatetimeIn(List<Date> values) {
-            addCriterion("createTime in", values, "createtime");
-            return (Criteria) this;
-        }
-
-        public Criteria andCreatetimeNotIn(List<Date> values) {
-            addCriterion("createTime not in", values, "createtime");
-            return (Criteria) this;
-        }
-
-        public Criteria andCreatetimeBetween(Date value1, Date value2) {
-            addCriterion("createTime between", value1, value2, "createtime");
-            return (Criteria) this;
-        }
-
-        public Criteria andCreatetimeNotBetween(Date value1, Date value2) {
-            addCriterion("createTime not between", value1, value2, "createtime");
-            return (Criteria) this;
-        }
-
-        public Criteria andDescriptionIsNull() {
-            addCriterion("description is null");
-            return (Criteria) this;
-        }
-
-        public Criteria andDescriptionIsNotNull() {
-            addCriterion("description is not null");
-            return (Criteria) this;
-        }
-
-        public Criteria andDescriptionEqualTo(String value) {
-            addCriterion("description =", value, "description");
-            return (Criteria) this;
-        }
-
-        public Criteria andDescriptionNotEqualTo(String value) {
-            addCriterion("description <>", value, "description");
-            return (Criteria) this;
-        }
-
-        public Criteria andDescriptionGreaterThan(String value) {
-            addCriterion("description >", value, "description");
-            return (Criteria) this;
-        }
-
-        public Criteria andDescriptionGreaterThanOrEqualTo(String value) {
-            addCriterion("description >=", value, "description");
-            return (Criteria) this;
-        }
-
-        public Criteria andDescriptionLessThan(String value) {
-            addCriterion("description <", value, "description");
-            return (Criteria) this;
-        }
-
-        public Criteria andDescriptionLessThanOrEqualTo(String value) {
-            addCriterion("description <=", value, "description");
-            return (Criteria) this;
-        }
-
-        public Criteria andDescriptionLike(String value) {
-            addCriterion("description like", value, "description");
-            return (Criteria) this;
-        }
-
-        public Criteria andDescriptionNotLike(String value) {
-            addCriterion("description not like", value, "description");
-            return (Criteria) this;
-        }
-
-        public Criteria andDescriptionIn(List<String> values) {
-            addCriterion("description in", values, "description");
-            return (Criteria) this;
-        }
-
-        public Criteria andDescriptionNotIn(List<String> values) {
-            addCriterion("description not in", values, "description");
-            return (Criteria) this;
-        }
-
-        public Criteria andDescriptionBetween(String value1, String value2) {
-            addCriterion("description between", value1, value2, "description");
-            return (Criteria) this;
-        }
-
-        public Criteria andDescriptionNotBetween(String value1, String value2) {
-            addCriterion("description not between", value1, value2, "description");
-            return (Criteria) this;
-        }
-    }
-
-    public static class Criteria extends GeneratedCriteria {
-
-        protected Criteria() {
-            super();
-        }
-    }
-
-    public static class Criterion {
-        private String condition;
-
-        private Object value;
-
-        private Object secondValue;
-
-        private boolean noValue;
-
-        private boolean singleValue;
-
-        private boolean betweenValue;
-
-        private boolean listValue;
-
-        private String typeHandler;
-
-        public String getCondition() {
-            return condition;
-        }
-
-        public Object getValue() {
-            return value;
-        }
-
-        public Object getSecondValue() {
-            return secondValue;
-        }
-
-        public boolean isNoValue() {
-            return noValue;
-        }
-
-        public boolean isSingleValue() {
-            return singleValue;
-        }
-
-        public boolean isBetweenValue() {
-            return betweenValue;
-        }
-
-        public boolean isListValue() {
-            return listValue;
-        }
-
-        public String getTypeHandler() {
-            return typeHandler;
-        }
-
-        protected Criterion(String condition) {
-            super();
-            this.condition = condition;
-            this.typeHandler = null;
-            this.noValue = true;
-        }
-
-        protected Criterion(String condition, Object value, String typeHandler) {
-            super();
-            this.condition = condition;
-            this.value = value;
-            this.typeHandler = typeHandler;
-            if (value instanceof List<?>) {
-                this.listValue = true;
-            } else {
-                this.singleValue = true;
-            }
-        }
-
-        protected Criterion(String condition, Object value) {
-            this(condition, value, null);
-        }
-
-        protected Criterion(String condition, Object value, Object secondValue, String typeHandler) {
-            super();
-            this.condition = condition;
-            this.value = value;
-            this.secondValue = secondValue;
-            this.typeHandler = typeHandler;
-            this.betweenValue = true;
-        }
-
-        protected Criterion(String condition, Object value, Object secondValue) {
-            this(condition, value, secondValue, null);
-        }
-    }
-}

accompany-admin/accompany-admin-sdk/src/main/java/com/accompany/admin/model/AdminDictKey.java

@@ -1,23 +0,0 @@
-package com.accompany.admin.model;
-
-public class AdminDictKey {
-    private String code;
-
-    private String dictkey;
-
-    public String getCode() {
-        return code;
-    }
-
-    public void setCode(String code) {
-        this.code = code == null ? null : code.trim();
-    }
-
-    public String getDictkey() {
-        return dictkey;
-    }
-
-    public void setDictkey(String dictkey) {
-        this.dictkey = dictkey == null ? null : dictkey.trim();
-    }
-}

accompany-admin/accompany-admin-sdk/src/main/java/com/accompany/admin/model/batch/FlowDataBatchSearch.java

@@ -1,135 +0,0 @@
-package com.accompany.admin.model.batch;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import org.springframework.format.annotation.DateTimeFormat;
-
-import java.math.BigDecimal;
-import java.util.Date;
-
-/**
- * @author: liaozetao
- * @date: 2023/9/22 15:25
- * @description:
- */
-@Data
-@TableName("flow_data_batch_search")
-public class FlowDataBatchSearch {
-
-    /**
-     * 主键
-     */
-    @ApiModelProperty("主键")
-    @TableId(type = IdType.AUTO)
-    private Long id;
-
-    /**
-     * 名称
-     */
-    @ApiModelProperty("名称")
-    private String name;
-
-    /**
-     * 负责人
-     */
-    @ApiModelProperty("负责人")
-    private String person;
-
-    /**
-     * 预算
-     */
-    @ApiModelProperty("预算")
-    private BigDecimal amount;
-
-    /**
-     * 关键字
-     */
-    @ApiModelProperty("关键字")
-    private String searchKey;
-
-    /**
-     * 房间UID
-     */
-    @ApiModelProperty("房间UID")
-    private Long roomUid;
-
-    /**
-     * 开始时间
-     */
-    @ApiModelProperty("开始时间")
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
-    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    private Date startTime;
-
-    /**
-     * 结束时间
-     */
-    @ApiModelProperty("结束时间")
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
-    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    private Date endTime;
-
-    /**
-     * 创建时间
-     */
-    @ApiModelProperty("创建时间")
-    private Date createTime;
-
-    /**
-     * 更新时间
-     */
-    @ApiModelProperty("更新时间")
-    private Date updateTime;
-
-    /**
-     * 期间新增UV
-     */
-    @ApiModelProperty("期间新增UV")
-    private Integer timeUv = 0;
-
-    /**
-     * 新增成本
-     */
-    @ApiModelProperty("新增成本")
-    private BigDecimal costAmount = BigDecimal.ZERO;
-
-    /**
-     * 归因新增UV
-     */
-    @ApiModelProperty("归因新增UV")
-    private Integer ascribeTimeUv = 0;
-
-    /**
-     * 归因后进入归因房间UV
-     */
-    @ApiModelProperty("归因后进入归因房间UV")
-    private Integer inRoomUv = 0;
-
-    /**
-     * 归因新增成本
-     */
-    @ApiModelProperty("归因新增成本")
-    private BigDecimal ascribeCostAmount = BigDecimal.ZERO;
-
-    /**
-     * 活动内私聊用户数
-     */
-    @ApiModelProperty("活动内私聊用户数")
-    private Integer chatNum = 0;
-
-    /**
-     * 私聊用户成本
-     */
-    @ApiModelProperty("私聊用户成本")
-    private BigDecimal chatCostAmount = BigDecimal.ZERO;
-
-    /**
-     * 是否固定
-     */
-    @ApiModelProperty("是否固定")
-    private Integer isFixed = 0;
-}

accompany-admin/accompany-admin-sdk/src/main/java/com/accompany/admin/model/guild/GuildAdminCarRef.java

@@ -0,0 +1,28 @@
+package com.accompany.admin.model.guild;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * 后台超管【赠送座驾】权限表实体类
+ *
+ * @author
+ * @since 2025-10-14
+ */
+@Data
+public class GuildAdminCarRef implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @TableId(value = "id" , type = IdType.AUTO)
+    private Long id;
+    private Integer roleId;
+    private Integer carId;
+    private Date createTime;
+
+
+}

accompany-admin/accompany-admin-sdk/src/main/java/com/accompany/admin/params/ActCallBattleItemSaveReqParams.java

@@ -1,28 +0,0 @@
-/*
- * 文 件 名:  LuckySeaItemSaveReqParams
- * 版    权:
- * 描    述:  <描述>
- * 创建人:  H1
- * 创建时间:  2021/9/26
- * 修改人:
- * 修改内容:
- * 修改时间:
- */
-package com.accompany.admin.params;
-
-import com.accompany.business.model.callbattle.ActCallBattleItem;
-import lombok.Data;
-
-import java.util.List;
-
-/**
- * <br>类描述:
- * <br>功能详细描述:
- *
- * @author H1
- * @date [2021/9/26]
- */
-@Data
-public class ActCallBattleItemSaveReqParams {
-    private List<ActCallBattleItem> items;
-}

accompany-admin/accompany-admin-sdk/src/main/java/com/accompany/admin/params/LuckySeaItemSaveReqParams.java

@@ -1,28 +0,0 @@
-/*
- * 文 件 名:  LuckySeaItemSaveReqParams
- * 版    权:
- * 描    述:  <描述>
- * 创建人:  H1
- * 创建时间:  2021/9/26
- * 修改人:
- * 修改内容:
- * 修改时间:
- */
-package com.accompany.admin.params;
-
-import com.accompany.business.model.activity.luckysea.LuckySeaItem;
-import lombok.Data;
-
-import java.util.List;
-
-/**
- * <br>类描述:
- * <br>功能详细描述:
- *
- * @author H1
- * @date [2021/9/26]
- */
-@Data
-public class LuckySeaItemSaveReqParams {
-    private List<LuckySeaItem> items;
-}

accompany-admin/accompany-admin-sdk/src/main/java/com/accompany/admin/params/flowteam/FlowTeamEditInviteUserParams.java

@@ -1,27 +0,0 @@
-/*
- * 文 件 名:  FlowTeamEditInviteUserParams
- * 版    权:
- * 描    述:  <描述>
- * 创建人:  H1
- * 创建时间:  2022/4/25
- * 修改人:
- * 修改内容:
- * 修改时间:
- */
-package com.accompany.admin.params.flowteam;
-
-import com.xuanyin.flowteam.model.FlowTeamMemberInviteUser;
-import lombok.Data;
-
-/**
- * <br>类描述:
- * <br>功能详细描述:
- *
- * @author H1
- * @date [2022/4/25]
- */
-@Data
-public class FlowTeamEditInviteUserParams extends FlowTeamMemberInviteUser {
-    private Byte optType;
-    private Long optUid;
-}

accompany-admin/accompany-admin-sdk/src/main/java/com/accompany/admin/params/flowteam/FlowTeamStatisticParams.java

@@ -1,65 +0,0 @@
-package com.accompany.admin.params.flowteam;
-
-import com.accompany.common.utils.AppUtils;
-import com.accompany.common.utils.StringUtils;
-import lombok.Data;
-
-import java.util.List;
-
-@Data
-public class FlowTeamStatisticParams {
-
-    /**
-     * 组别
-     */
-    private String teamId;
-
-    /**
-     * 开始时间
-     */
-    private String startDate;
-    /**
-     * 结束时间
-     */
-    private String endDate;
-
-    /**
-     * 成员id
-     */
-    private Long memberId;
-
-    /**
-     * 应用筛选
-     */
-    private String app;
-
-    /**
-     * 充值开始时间
-     */
-    private String chargeStartTime;
-    /**
-     * 充值结束时间
-     */
-    private String chargeEndTime;
-
-    /**
-     * 由“app”参数转化成的AppEnum中的组合（如果app=PlanetStar,则这里对应PlanetStar和PlanetStar66）
-     */
-    private List<String> groupApps;
-
-    public void setApp(String app) {
-        this.app = app;
-        this.groupApps = AppUtils.getGroupApps(app);
-    }
-
-    public List<String> getGroupApps() {
-        if (groupApps == null && StringUtils.isNotBlank(app)) {
-            return AppUtils.getGroupApps(app);
-        }
-        return groupApps;
-    }
-
-    private List<String> teamIds;
-
-    private Long groupId;
-}

accompany-admin/accompany-admin-sdk/src/main/java/com/accompany/admin/params/flowteam/TeamMemberEditParams.java

@@ -1,11 +0,0 @@
-package com.accompany.admin.params.flowteam;
-
-import com.xuanyin.flowteam.model.FlowTeamMember;
-import lombok.Data;
-
-@Data
-public class TeamMemberEditParams extends FlowTeamMember {
-
-    private String inviteCodes;
-    private Long groupId;
-}

accompany-admin/accompany-admin-sdk/src/main/java/com/accompany/admin/params/flowteam/TeamMemberQueryParams.java

@@ -1,19 +0,0 @@
-package com.accompany.admin.params.flowteam;
-
-import lombok.Data;
-
-@Data
-public class TeamMemberQueryParams {
-
-    private String memberName;
-
-    private String memberPhone;
-
-    private String inviteCode;
-
-    private Integer pageNumber;
-    private Integer pageSize;
-    private String teamId;
-    private Long groupId;
-    private String teamIds;
-}

accompany-admin/accompany-admin-sdk/src/main/java/com/accompany/admin/params/linearlypool/PlatformDataReqParams.java

@@ -1,27 +1,24 @@
 package com.accompany.admin.params.linearlypool;
 
-import lombok.AllArgsConstructor;
-import lombok.Builder;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
-import lombok.NoArgsConstructor;
 
 import java.util.Date;
 
 /**
+ * 平台数据请求参数
  */
-@AllArgsConstructor
-@NoArgsConstructor
 @Data
-@Builder
+@ApiModel("平台数据请求参数")
 public class PlatformDataReqParams {
 
-    private Integer pageNum;
-
-    private Integer pageSize;
-
+    @ApiModelProperty("开始日期")
     private Date startDate;
 
+    @ApiModelProperty("结束日期")
     private Date endDate;
 
+    @ApiModelProperty("用户靓号")
     private Long erbanNo;
-}
+}

accompany-admin/accompany-admin-sdk/src/main/java/com/accompany/admin/params/linearlypool/PoolItemDraftSaveReqParams.java

@@ -1,14 +0,0 @@
-package com.accompany.admin.params.linearlypool;
-
-import com.accompany.business.model.linearlypool.LinearlyPrizePoolItemDraft;
-import lombok.Data;
-
-import java.util.List;
-
-@Data
-public class PoolItemDraftSaveReqParams {
-
-    private List<LinearlyPrizePoolItemDraft> poolItems;
-
-    private Byte prizePoolType;
-}

accompany-admin/accompany-admin-sdk/src/main/java/com/accompany/admin/params/linearlypool/PoolItemShowRatioReqParams.java

@@ -1,13 +0,0 @@
-package com.accompany.admin.params.linearlypool;
-
-import com.accompany.business.model.linearlypool.LinearlyPrizePoolItem;
-import lombok.Data;
-
-import java.util.List;
-
-@Data
-public class PoolItemShowRatioReqParams {
-
-    private List<LinearlyPrizePoolItem> poolItems;
-
-}

accompany-admin/accompany-admin-sdk/src/main/java/com/accompany/admin/vo/ChargeRecordAdminVo.java

@@ -71,6 +71,10 @@ public class ChargeRecordAdminVo {
     @FieldComment("创建时间")
     public String createTime;             // 创建时间
 
+    @ExcelProperty("更新时间")
+    @FieldComment("更新时间")
+    public String updateTime;             // 创建时间
+
 }
 
 

accompany-admin/accompany-admin-sdk/src/main/java/com/accompany/admin/vo/ChargeRecordPartitionRegionVo.java

@@ -0,0 +1,16 @@
+package com.accompany.admin.vo;
+
+import lombok.Data;
+
+import java.math.BigDecimal;
+
+@Data
+public class ChargeRecordPartitionRegionVo {
+
+    private String channel;
+    public String regionName;
+    public BigDecimal usd = BigDecimal.ZERO;
+
+}
+
+

accompany-admin/accompany-admin-sdk/src/main/java/com/accompany/admin/vo/FamilyMemberWeekLevelRewardStatAdminVo.java

@@ -2,38 +2,63 @@ package com.accompany.admin.vo;
 
 import com.alibaba.excel.annotation.ExcelIgnore;
 import com.alibaba.excel.annotation.ExcelProperty;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import java.math.BigDecimal;
 
 @Data
+@ApiModel("家族成员周等级奖励统计")
 public class FamilyMemberWeekLevelRewardStatAdminVo {
 
     @ExcelProperty("周期")
+    @ApiModelProperty("周期")
     private String cycleDate;
     @ExcelIgnore
+    @ApiModelProperty("家族成员ID")
     private Long familyMemberId;
     @ExcelProperty("公会id")
+    @ApiModelProperty("公会ID")
     private Integer familyId;
     @ExcelProperty("公会名")
+    @ApiModelProperty("公会名称")
     private String familyName;
     @ExcelProperty("会长id")
+    @ApiModelProperty("会长ID")
     private Long familyOwnerId;
     @ExcelProperty("会长昵称")
+    @ApiModelProperty("会长昵称")
     private String familyOwnerNick;
     @ExcelIgnore
+    @ApiModelProperty("用户UID")
     private Long uid;
     @ExcelProperty("主播id")
+    @ApiModelProperty("主播ID")
     private Long erbanNo;
     @ExcelProperty("主播昵称")
+    @ApiModelProperty("主播昵称")
     private String nick;
     @ExcelProperty("周奖励等级")
-    private Integer level;
+    @ApiModelProperty("周奖励等级")
+    private String level;
     @ExcelProperty("钻石流水")
+    @ApiModelProperty("钻石流水")
     private BigDecimal processNum;
-    @ExcelProperty("已获得金币")
+    @ExcelProperty("钻石奖励")
+    @ApiModelProperty("钻石奖励")
     private BigDecimal rewardNum;
+    @ExcelProperty("在麦有效天数")
+    @ApiModelProperty("在麦有效天数")
+    private Integer micValidDay;
+    @ExcelProperty("时长奖励")
+    @ApiModelProperty("时长奖励")
+    private BigDecimal bonusRewardNum;
+    @ExcelProperty("目标领取金币")
+    @ApiModelProperty("目标领取金币")
+    private BigDecimal totalRewardNum;
     @ExcelProperty("已领取金币")
+    @ApiModelProperty("已领取金币")
     private BigDecimal receivedNum;
 
-}
+}

accompany-admin/accompany-admin-sdk/src/main/java/com/accompany/admin/vo/GiftCompoundRewardAdminVo.java

@@ -1,29 +0,0 @@
-package com.accompany.admin.vo;
-
-import com.accompany.core.annotation.I18n;
-import lombok.Data;
-
-@Data
-public class GiftCompoundRewardAdminVo {
-
-    private Integer id;
-
-    private Integer giftId;
-
-    private Integer rate;
-
-    private Integer orderNo;
-
-    private Integer serviceNotice;
-
-    @I18n(className = "Gift")
-    private String giftName;
-
-    private Long goldPrice;
-
-    private Integer giftRate;
-
-    private String expendValue;
-
-    private Double expectValue;
-}

accompany-admin/accompany-admin-sdk/src/main/java/com/accompany/admin/vo/Lucky24ConfigAdminVo.java

@@ -31,6 +31,9 @@ public class Lucky24ConfigAdminVo {
     @ApiModelProperty("白名单用户id对比值N对应表")
     private Map<Long, BigDecimal> whiteErbanNoProductionRatioMap;
 
+    @ApiModelProperty("后台关注用户id列表")
+    private List<Long> adminFollowErbanNoList;
+
     @ApiModelProperty("")
     private Long preJudgeValue_H;
     @ApiModelProperty("")

accompany-admin/accompany-admin-sdk/src/main/java/com/accompany/admin/vo/OperationSmsRecordVo.java

@@ -1,125 +0,0 @@
-package com.accompany.admin.vo;
-
-import java.util.Date;
-
-public class OperationSmsRecordVo {
-    private Long recordId;
-
-    private Long uid;
-
-    private Long erbanNo;
-
-    private String phone;
-
-    private Integer templateId;
-
-    private String templateName;
-
-    private Integer sendStatus;
-
-    private Date createTime;
-
-    private Date sendTime;
-
-    private String errorMsg;
-
-    private Integer operator;
-
-    private String operatorName;
-
-    public Long getRecordId() {
-        return recordId;
-    }
-
-    public void setRecordId(Long recordId) {
-        this.recordId = recordId;
-    }
-
-    public Long getUid() {
-        return uid;
-    }
-
-    public void setUid(Long uid) {
-        this.uid = uid;
-    }
-
-    public String getPhone() {
-        return phone;
-    }
-
-    public void setPhone(String phone) {
-        this.phone = phone == null ? null : phone.trim();
-    }
-
-    public Integer getTemplateId() {
-        return templateId;
-    }
-
-    public void setTemplateId(Integer templateId) {
-        this.templateId = templateId;
-    }
-
-    public Integer getSendStatus() {
-        return sendStatus;
-    }
-
-    public void setSendStatus(Integer sendStatus) {
-        this.sendStatus = sendStatus;
-    }
-
-    public Date getCreateTime() {
-        return createTime;
-    }
-
-    public void setCreateTime(Date createTime) {
-        this.createTime = createTime;
-    }
-
-    public Date getSendTime() {
-        return sendTime;
-    }
-
-    public void setSendTime(Date sendTime) {
-        this.sendTime = sendTime;
-    }
-
-    public String getErrorMsg() {
-        return errorMsg;
-    }
-
-    public void setErrorMsg(String errorMsg) {
-        this.errorMsg = errorMsg == null ? null : errorMsg.trim();
-    }
-
-    public Integer getOperator() {
-        return operator;
-    }
-
-    public void setOperator(Integer operator) {
-        this.operator = operator;
-    }
-
-    public Long getErbanNo() {
-        return erbanNo;
-    }
-
-    public void setErbanNo(Long erbanNo) {
-        this.erbanNo = erbanNo;
-    }
-
-    public String getTemplateName() {
-        return templateName;
-    }
-
-    public void setTemplateName(String templateName) {
-        this.templateName = templateName;
-    }
-
-    public String getOperatorName() {
-        return operatorName;
-    }
-
-    public void setOperatorName(String operatorName) {
-        this.operatorName = operatorName;
-    }
-}

accompany-admin/accompany-admin-sdk/src/main/java/com/accompany/admin/vo/PhoneAuthApplyRecordExcelVo.java

@@ -1,31 +0,0 @@
-package com.accompany.admin.vo;
-
-import com.accompany.common.annotation.FieldComment;
-import com.accompany.core.vo.BaseVo;
-import lombok.Data;
-
-import java.util.Date;
-
-@Data
-public class PhoneAuthApplyRecordExcelVo extends BaseVo {
-    private static final long serialVersionUID = 1L;
-
-    @FieldComment("id")
-    public Long id;
-    @FieldComment("申请区号")
-    public String phoneAreaCode;
-    @FieldComment("申请手机号")
-    public String phone;
-    @FieldComment("授权码")
-    public String authCode;
-    @FieldComment("授权状态")
-    public Byte status;
-    @FieldComment("申请时间")
-    public Date createTime;
-    @FieldComment("备注")
-    public String remark;
-    @FieldComment("操作人")
-    public String operator;
-    @FieldComment("更新授权时间")
-    public Date updateTime;
-}

accompany-admin/accompany-admin-sdk/src/main/java/com/accompany/admin/vo/UserCertifyRecordVo.java

@@ -1,102 +0,0 @@
-package com.accompany.admin.vo;
-
-import java.util.Date;
-
-/**
- * ｛这里添加描述｝
- *
- * @author fangchengyan
- * @date 2019-05-20 14:49
- */
-public class UserCertifyRecordVo {
-
-    private Long recordId;
-
-    private Long uid;
-
-    private String name;
-
-    private String idCardNum;
-
-    private String phone;
-
-    private Byte bindStatus;
-
-    private String certifyType;
-
-    private Date createTime;
-
-    private Long erbanNo;
-
-    public Long getRecordId() {
-        return recordId;
-    }
-
-    public void setRecordId(Long recordId) {
-        this.recordId = recordId;
-    }
-
-    public Long getUid() {
-        return uid;
-    }
-
-    public void setUid(Long uid) {
-        this.uid = uid;
-    }
-
-    public String getName() {
-        return name;
-    }
-
-    public void setName(String name) {
-        this.name = name;
-    }
-
-    public String getIdCardNum() {
-        return idCardNum;
-    }
-
-    public void setIdCardNum(String idCardNum) {
-        this.idCardNum = idCardNum;
-    }
-
-    public String getPhone() {
-        return phone;
-    }
-
-    public void setPhone(String phone) {
-        this.phone = phone;
-    }
-
-    public Byte getBindStatus() {
-        return bindStatus;
-    }
-
-    public void setBindStatus(Byte bindStatus) {
-        this.bindStatus = bindStatus;
-    }
-
-    public String getCertifyType() {
-        return certifyType;
-    }
-
-    public void setCertifyType(String certifyType) {
-        this.certifyType = certifyType;
-    }
-
-    public Date getCreateTime() {
-        return createTime;
-    }
-
-    public void setCreateTime(Date createTime) {
-        this.createTime = createTime;
-    }
-
-    public Long getErbanNo() {
-        return erbanNo;
-    }
-
-    public void setErbanNo(Long erbanNo) {
-        this.erbanNo = erbanNo;
-    }
-}

accompany-admin/accompany-admin-sdk/src/main/java/com/accompany/admin/vo/UsersVo.java

@@ -13,4 +13,6 @@ public class UsersVo extends Users {
     private double diamondsNum;
 
     private double guildUsdNum;
+
+    private double gameUsdNum;
 }

accompany-admin/accompany-admin-sdk/src/main/java/com/accompany/admin/vo/apply/PhoneAuthApplyRecordAdminVo.java

@@ -1,38 +0,0 @@
-package com.accompany.admin.vo.apply;
-
-import com.accompany.core.model.phone.PhoneAuthApplyRecord;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import java.util.Date;
-
-/**
- * @author: liaozetao
- * @date: 2023/11/20 17:40
- * @description:
- */
-@Data
-@ApiModel
-public class PhoneAuthApplyRecordAdminVo extends PhoneAuthApplyRecord {
-
-    /**
-     * 用户ID
-     */
-    @ApiModelProperty("用户ID")
-    private Long erbanNo;
-
-    /**
-     * 昵称
-     */
-    @ApiModelProperty("昵称")
-    private String nick;
-
-    /**
-     * 注册时间
-     */
-    @ApiModelProperty("注册时间")
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
-    private Date signTime;
-}

accompany-admin/accompany-admin-sdk/src/main/java/com/accompany/admin/vo/audiocard/UserAudioCardAdminVo.java

@@ -1,21 +0,0 @@
-package com.accompany.admin.vo.audiocard;
-
-import lombok.Data;
-
-import java.util.Date;
-
-@Data
-public class UserAudioCardAdminVo {
-
-    private Long id;
-    private Long uid;
-    private Long erbanNo;
-    private String nick;
-    private String audioUrl;
-    private Integer second;
-    private Date createTime;
-    private Byte status;
-    private String auditor;
-    private Date auditTime;
-    private Boolean isDel;
-}

accompany-admin/accompany-admin-sdk/src/main/java/com/accompany/admin/vo/batch/FlowDataBatchSearchAdminVo.java

@@ -1,23 +0,0 @@
-package com.accompany.admin.vo.batch;
-
-import com.accompany.admin.model.batch.FlowDataBatchSearch;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-/**
- * @author: liaozetao
- * @date: 2023/9/22 15:40
- * @description:
- */
-@Data
-@ApiModel
-public class FlowDataBatchSearchAdminVo extends FlowDataBatchSearch {
-
-    /**
-     * 房间名称
-     */
-    @ApiModelProperty("归因房间名称")
-    private String roomName;
-
-}

accompany-admin/accompany-admin-sdk/src/main/java/com/accompany/admin/vo/batch/FlowDataBatchSearchGrowAdminVo.java

@@ -1,69 +0,0 @@
-package com.accompany.admin.vo.batch;
-
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-/**
- * @author: liaozetao
- * @date: 2023/9/22 18:00
- * @description:
- */
-@Data
-@ApiModel
-public class FlowDataBatchSearchGrowAdminVo {
-
-    /**
-     * 统计项
-     */
-    @ApiModelProperty("统计项")
-    private String countItem;
-
-    /**
-     * 是否百分比
-     */
-    @ApiModelProperty("是否百分比")
-    private Boolean isPercentage = false;
-
-    /**
-     * 当天情况
-     */
-    @ApiModelProperty("当天情况")
-    private Double currCondition = 0D;
-
-    /**
-     * 次日情况
-     */
-    @ApiModelProperty("次日情况")
-    private Double nextCondition = 0D;
-
-    /**
-     * 3日情况
-     */
-    @ApiModelProperty("3日情况")
-    private Double threeCondition = 0D;
-
-    /**
-     * 7日情况
-     */
-    @ApiModelProperty("7日情况")
-    private Double sevenCondition = 0D;
-
-    /**
-     * 15日情况
-     */
-    @ApiModelProperty("15日情况")
-    private Double fifteenCondition = 0D;
-
-    /**
-     * 30日情况
-     */
-    @ApiModelProperty("30日情况")
-    private Double thirtyCondition = 0D;
-
-    /**
-     * 累计到目前
-     */
-    @ApiModelProperty("累计到目前")
-    private Double totalCondition = 0D;
-}

accompany-admin/accompany-admin-sdk/src/main/java/com/accompany/admin/vo/callbattle/ActCallBattleAdminRecordVo.java

@@ -1,35 +0,0 @@
-/*
- * 文 件 名:  LuckySeaActAdminRecordVo
- * 版    权:
- * 描    述:  <描述>
- * 创建人:  H1
- * 创建时间:  2021/1/12
- * 修改人:
- * 修改内容:
- * 修改时间:
- */
-package com.accompany.admin.vo.callbattle;
-
-import lombok.Data;
-
-import java.util.Date;
-
-/**
- * <br>类描述:
- * <br>功能详细描述:
- *
- * @author H1
- * @date [2021/1/12]
- */
-@Data
-public class ActCallBattleAdminRecordVo {
-    private String roundId;
-    private Date startTime;
-    private Date endTime;
-    private Integer memberNum;
-    private Long userInputPieceNum;
-    private Long prizePieceNum;
-    private Double ticket;
-    private String prizeName;
-    private String restraintName;
-}

accompany-admin/accompany-admin-sdk/src/main/java/com/accompany/admin/vo/callbattle/ActCallBattleAdminRoundDetailVo.java

@@ -1,29 +0,0 @@
-/*
- * 文 件 名:  LuckySeaActAdminRoundDetailVo
- * 版    权:
- * 描    述:  <描述>
- * 创建人:  H1
- * 创建时间:  2021/1/12
- * 修改人:
- * 修改内容:
- * 修改时间:
- */
-package com.accompany.admin.vo.callbattle;
-
-import lombok.Data;
-
-/**
- * <br>类描述:
- * <br>功能详细描述:
- *
- * @author H1
- * @date [2021/1/12]
- */
-@Data
-public class ActCallBattleAdminRoundDetailVo {
-    private Long uid;
-    private Long erbanNo;
-    private String nick;
-    private Long costPieceNum;
-    private Long prizePieceNum;
-}

accompany-admin/accompany-admin-sdk/src/main/java/com/accompany/admin/vo/callbattle/ActCallBattleAdminUserDrawRecord.java

@@ -1,33 +0,0 @@
-/*
- * 文 件 名:  LuckySeaActAdminUserDrawRecord
- * 版    权:
- * 描    述:  <描述>
- * 创建人:  H1
- * 创建时间:  2021/1/12
- * 修改人:
- * 修改内容:
- * 修改时间:
- */
-package com.accompany.admin.vo.callbattle;
-
-import lombok.Data;
-
-import java.util.Date;
-
-/**
- * <br>类描述:
- * <br>功能详细描述:
- *
- * @author H1
- * @date [2021/1/12]
- */
-@Data
-public class ActCallBattleAdminUserDrawRecord {
-    private Long uid;
-    private Long erbanNo;
-    private String nick;
-    private String roundId;
-    private Date endTime;
-    private Long costPieceNum;
-    private Long prizePieceNum;
-}

accompany-admin/accompany-admin-sdk/src/main/java/com/accompany/admin/vo/callbattle/ActCallBattlePlatformStatVo.java

@@ -1,34 +0,0 @@
-/*
- * 文 件 名:  LuckySeaActPlatformStatVo
- * 版    权:
- * 描    述:  <描述>
- * 创建人:  H1
- * 创建时间:  2021/1/11
- * 修改人:
- * 修改内容:
- * 修改时间:
- */
-package com.accompany.admin.vo.callbattle;
-
-import lombok.Data;
-
-import java.util.Date;
-
-/**
- * <br>类描述: 召唤战斗活动平台数据统计vo
- * <br>功能详细描述:
- *
- * @author H1
- * @date [2021/1/11]
- */
-@Data
-public class ActCallBattlePlatformStatVo {
-
-    private Date queryDate;
-    private Integer memberNum;
-    private Integer totalPlayTimes;
-    private Integer roundNum;
-    private Long totalPiece;
-    private Long totalPlatformValue;
-    private Double totalTicket;
-}

accompany-admin/accompany-admin-sdk/src/main/java/com/accompany/admin/vo/chat/PublicChatTopRecordAdminVo.java

@@ -1,53 +0,0 @@
-package com.accompany.admin.vo.chat;
-
-import com.fasterxml.jackson.annotation.JsonFormat;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import java.util.Date;
-
-/**
- * @author: liaozetao
- * @date: 2024/5/8 10:46
- * @description:
- */
-@Data
-public class PublicChatTopRecordAdminVo {
-
-    /**
-     * 用户ID
-     */
-    @ApiModelProperty("用户ID")
-    private Long erbanNo;
-
-    /**
-     * 用户昵称
-     */
-    @ApiModelProperty("用户昵称")
-    private String nick;
-
-    /**
-     * 所属地区
-     */
-    @ApiModelProperty("所属地区")
-    private String partitionDesc;
-
-    /**
-     * 付费金额（金币）
-     */
-    @ApiModelProperty("付费金额（金币）")
-    private Integer payMoneyNum;
-
-    /**
-     * 付费日期
-     */
-    @ApiModelProperty("付费日期")
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
-    private Date createTime;
-
-    /**
-     * 头条内容
-     */
-    @ApiModelProperty("头条内容")
-    private String content;
-}

accompany-admin/accompany-admin-sdk/src/main/java/com/accompany/admin/vo/family/FamilyAdminVo.java

@@ -65,5 +65,8 @@ public class FamilyAdminVo {
     private String inviteCheck;
     @ExcelIgnore
     private Boolean enableEditInvite;
+    @ApiModelProperty("操作人")
+    @ExcelProperty("操作人")
+    private String operator;
 
 }

accompany-admin/accompany-admin-sdk/src/main/java/com/accompany/admin/vo/family/FamilyMemberDailyWageStatAdminVo.java

@@ -1,54 +0,0 @@
-
-package com.accompany.admin.vo.family;
-
-import com.alibaba.excel.annotation.ExcelIgnore;
-import com.alibaba.excel.annotation.ExcelProperty;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import java.math.BigDecimal;
-
-@ApiModel
-@Data
-public class FamilyMemberDailyWageStatAdminVo {
-    @ExcelProperty("家族id")
-    @ApiModelProperty("家族id")
-    private String date;
-    @ExcelProperty("家族id")
-    @ApiModelProperty("家族id")
-    private Integer familyId;
-    @ExcelProperty("家族名")
-    @ApiModelProperty("家族名")
-    private String familyName;
-    @ExcelIgnore
-    private Long uid;
-    @ExcelProperty("成员id")
-    @ApiModelProperty("成员id")
-    private Long erbanNo;
-    @ExcelProperty("成员昵称")
-    @ApiModelProperty("成员昵称")
-    private String nick;
-    @ExcelProperty("开播时长（秒）")
-    @ApiModelProperty("开播时长")
-    private String micRemainTime;
-    @ExcelProperty("是否有效天数")
-    @ApiModelProperty("是否有效天数")
-    private Boolean micVaild;
-    @ExcelProperty("金币收入")
-    @ApiModelProperty("金币收入")
-    private Long goldIncome = 0L;
-    @ExcelProperty("累计金币收入")
-    @ApiModelProperty("累计金币收入")
-    private Long savedGoldIncome = 0L;
-    @ApiModelProperty("累计金币工资")
-    @ExcelProperty("累计金币工资")
-    private BigDecimal savedGoldWage = BigDecimal.ZERO;
-    @ApiModelProperty("累计金币工资")
-    @ExcelProperty("累计金币工资")
-    private BigDecimal savedAgentWage = BigDecimal.ZERO;
-    @ExcelProperty("钻石余额")
-    @ApiModelProperty("钻石余额")
-    private Double diamondRemain = 0D;
-
-}

accompany-admin/accompany-admin-sdk/src/main/java/com/accompany/admin/vo/family/FamilyMemberViolationRecordAdminVo.java

@@ -1,34 +0,0 @@
-package com.accompany.admin.vo.family;
-
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-@Data
-@ApiModel
-public class FamilyMemberViolationRecordAdminVo {
-    @ApiModelProperty("记录id")
-    private Long id;
-    @ApiModelProperty("家族id")
-    private Integer familyId;
-    @ApiModelProperty("家族名")
-    private String familyName;
-    @ApiModelProperty("uid")
-    private Long uid;
-    @ApiModelProperty("erbanNo")
-    private Long erbanNo;
-    @ApiModelProperty("昵称")
-    private String nick;
-    @ApiModelProperty("违规时间")
-    private String violationTime;
-    @ApiModelProperty("违规种类id")
-    private Integer violationId;
-    @ApiModelProperty("违规种类")
-    private String type;
-    @ApiModelProperty("警告内容")
-    private String content;
-    @ApiModelProperty("创建时间")
-    private String createTime;
-    @ApiModelProperty("操作人")
-    private String adminName;
-}

accompany-admin/accompany-admin-sdk/src/main/java/com/accompany/admin/vo/family/FamilyMemberWageStatAdminVo.java

@@ -29,15 +29,15 @@ public class FamilyMemberWageStatAdminVo extends SimpleFamilyMemberVo {
     @ExcelProperty("有效天数")
     @ApiModelProperty("有效天数")
     private Integer micVaildDays;
-    @ExcelProperty("送礼用户数")
-    @ApiModelProperty("送礼用户数")
-    private Long sendGiftUserNum = 0L;
     @ExcelProperty("金币收入")
     @ApiModelProperty("金币收入")
-    private Long goldIncome = 0L;
+    private BigDecimal goldIncome = BigDecimal.ZERO;
     @ApiModelProperty("金币工资")
     @ExcelProperty("金币工资")
     private BigDecimal goldWage = BigDecimal.ZERO;
+    @ApiModelProperty("钻石工资")
+    @ExcelProperty("钻石工资")
+    private BigDecimal diamondWage = BigDecimal.ZERO;
     @ApiModelProperty("代理工资")
     @ExcelProperty("代理工资")
     private BigDecimal agentWage = BigDecimal.ZERO;

accompany-admin/accompany-admin-sdk/src/main/java/com/accompany/admin/vo/family/FamilyWageStatAdminVo.java

@@ -34,15 +34,18 @@ public class FamilyWageStatAdminVo {
     private Long memberNum = 0L;
     @ApiModelProperty("金币收入")
     @ExcelProperty("金币收入")
-    private Long goldIncome = 0L;
-    @ApiModelProperty("公会工资")
-    @ExcelProperty("公会工资")
+    private BigDecimal goldIncome = BigDecimal.ZERO;
+    @ApiModelProperty("金币工资")
+    @ExcelProperty("金币工资")
     private BigDecimal goldWage = BigDecimal.ZERO;
+    @ApiModelProperty("钻石余额")
+    @ExcelProperty("钻石余额")
+    private BigDecimal diamondRemain = BigDecimal.ZERO;
+    @ApiModelProperty("钻石工资")
+    @ExcelProperty("钻石工资")
+    private BigDecimal diamondWage = BigDecimal.ZERO;
     @ApiModelProperty("代理工资")
     @ExcelProperty("代理工资")
     private BigDecimal agentWage = BigDecimal.ZERO;
-    @ApiModelProperty("钻石余额")
-    @ExcelProperty("钻石余额")
-    private String diamondRemain = "-";
 
 }

accompany-admin/accompany-admin-sdk/src/main/java/com/accompany/admin/vo/findlove/PoolItemVo.java

@@ -1,10 +1,9 @@
 package com.accompany.admin.vo.findlove;
 
-import com.accompany.business.model.linearlypool.LinearlyPrizePoolItem;
 import lombok.Data;
 
 @Data
-public class PoolItemVo extends LinearlyPrizePoolItem {
+public class PoolItemVo {
 
     /**
      * 奖品类型 see {@link com.accompany.business.constant.PrizeTypeEnum}

accompany-admin/accompany-admin-sdk/src/main/java/com/accompany/admin/vo/flowteam/FlowTeamConfVO.java

@@ -1,20 +0,0 @@
-package com.accompany.admin.vo.flowteam;
-
-import lombok.Data;
-
-import java.util.List;
-
-@Data
-public class FlowTeamConfVO {
-
-    @Data
-    public static class TeamItem {
-        private String teamId;
-
-        private String teamName;
-    }
-
-    List<TeamItem> teams;
-
-    Long canRefillInterval;
-}

accompany-admin/accompany-admin-sdk/src/main/java/com/accompany/admin/vo/flowteam/FlowTeamGroupAdminVO.java

@@ -1,31 +0,0 @@
-/*
- * 文 件 名:  FlowTeamGroupAdminVO
- * 版    权:
- * 描    述:  <描述>
- * 创建人:  H1
- * 创建时间:  2022/1/13
- * 修改人:
- * 修改内容:
- * 修改时间:
- */
-package com.accompany.admin.vo.flowteam;
-
-import com.xuanyin.flowteam.model.FlowTeamGroup;
-import com.xuanyin.flowteam.model.FlowTeamMember;
-import lombok.Data;
-
-import java.util.List;
-
-/**
- * <br>类描述:
- * <br>功能详细描述:
- *
- * @author H1
- * @date [2022/1/13]
- */
-@Data
-public class FlowTeamGroupAdminVO extends FlowTeamGroup {
-    private List<FlowTeamMember> groupLeaders;
-    private Long teamNum;
-    private Integer memberNum;
-}

accompany-admin/accompany-admin-sdk/src/main/java/com/accompany/admin/vo/flowteam/FlowTeamGroupStatisticSummaryVO.java

@@ -1,13 +0,0 @@
-package com.accompany.admin.vo.flowteam;
-
-import lombok.Data;
-
-@Data
-public class FlowTeamGroupStatisticSummaryVO extends TeamStatisticBaseVO {
-
-    private String groupId;
-
-    private Integer memberCount;
-
-    private String groupLeaders;
-}

accompany-admin/accompany-admin-sdk/src/main/java/com/accompany/admin/vo/flowteam/FlowTeamInfoAdminVO.java

@@ -1,30 +0,0 @@
-/*
- * 文 件 名:  FlowTeamInfoAdminVO
- * 版    权:
- * 描    述:  <描述>
- * 创建人:  H1
- * 创建时间:  2022/1/14
- * 修改人:
- * 修改内容:
- * 修改时间:
- */
-package com.accompany.admin.vo.flowteam;
-
-import com.xuanyin.flowteam.model.FlowTeamInfo;
-import com.xuanyin.flowteam.model.FlowTeamMember;
-import lombok.Data;
-
-import java.util.List;
-
-/**
- * <br>类描述:
- * <br>功能详细描述:
- *
- * @author H1
- * @date [2022/1/14]
- */
-@Data
-public class FlowTeamInfoAdminVO extends FlowTeamInfo {
-    private List<FlowTeamMember> teamLeaders;
-    private Long memberNum;
-}

accompany-admin/accompany-admin-sdk/src/main/java/com/accompany/admin/vo/flowteam/FlowTeamInviteCodeRecordAdminVO.java

@@ -1,31 +0,0 @@
-/*
- * 文 件 名:  FlowTeamInviteCodeRecordAdminVO
- * 版    权:
- * 描    述:  <描述>
- * 创建人:  H1
- * 创建时间:  2022/1/19
- * 修改人:
- * 修改内容:
- * 修改时间:
- */
-package com.accompany.admin.vo.flowteam;
-
-import com.xuanyin.flowteam.model.FlowTeamInviteCodeRecord;
-import lombok.AllArgsConstructor;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-
-/**
- * <br>类描述:
- * <br>功能详细描述:
- *
- * @author H1
- * @date [2022/1/19]
- */
-@Data
-@AllArgsConstructor
-@NoArgsConstructor
-public class FlowTeamInviteCodeRecordAdminVO extends FlowTeamInviteCodeRecord {
-    private String teamName;
-    private Boolean hasBind;
-}

accompany-admin/accompany-admin-sdk/src/main/java/com/accompany/admin/vo/flowteam/FlowTeamInviteUserVO.java

@@ -1,36 +0,0 @@
-/*
- * 文 件 名:  FlowTeamInviteUserVO
- * 版    权:
- * 描    述:  <描述>
- * 创建人:  H1
- * 创建时间:  2022/4/24
- * 修改人:
- * 修改内容:
- * 修改时间:
- */
-package com.accompany.admin.vo.flowteam;
-
-import lombok.Data;
-
-import java.util.Date;
-
-/**
- * <br>类描述:
- * <br>功能详细描述:
- *
- * @author H1
- * @date [2022/4/24]
- */
-@Data
-public class FlowTeamInviteUserVO {
-    private Long erbanNo;
-    private String nick;
-    private Long uid;
-    private String groupName;
-    private String teamName;
-    private String memberName;
-    private String inviteCode;
-    private Date inviteTime;
-
-    private Integer source;
-}

accompany-admin/accompany-admin-sdk/src/main/java/com/accompany/admin/vo/flowteam/FlowTeamMemberVO.java

@@ -1,18 +0,0 @@
-package com.accompany.admin.vo.flowteam;
-
-import com.xuanyin.flowteam.model.FlowTeamMember;
-import lombok.Data;
-
-@Data
-public class FlowTeamMemberVO extends FlowTeamMember {
-
-    /**
-     * 邀请码
-     */
-    private String inviteCodes;
-
-    /**
-     * 团队id
-     */
-    private Long groupId;
-}

accompany-admin/accompany-admin-sdk/src/main/java/com/accompany/admin/vo/flowteam/FlowTeamStatisticDetailVO.java

@@ -1,19 +0,0 @@
-package com.accompany.admin.vo.flowteam;
-
-import lombok.Data;
-
-@Data
-public class FlowTeamStatisticDetailVO extends TeamStatisticBaseVO {
-
-    private Long memberId;
-
-    private String memberName;
-
-    private String teamId;
-
-    private Integer teamRole;
-
-    private Integer memberStatus;
-
-    private String inviteCodes;
-}

accompany-admin/accompany-admin-sdk/src/main/java/com/accompany/admin/vo/flowteam/FlowTeamStatisticSummaryVO.java

@@ -1,19 +0,0 @@
-package com.accompany.admin.vo.flowteam;
-
-import lombok.Data;
-
-@Data
-public class FlowTeamStatisticSummaryVO extends TeamStatisticBaseVO {
-
-    private String teamId;
-
-    private Integer memberCount;
-
-    private String teamLeaders;
-
-    private Integer twoRemainCount;
-
-    private Integer sevenRemainCount;
-
-    private Integer thirtyRemainCount;
-}

accompany-admin/accompany-admin-sdk/src/main/java/com/accompany/admin/vo/flowteam/FlowTeamStatisticUserDetailVO.java

@@ -1,73 +0,0 @@
-package com.accompany.admin.vo.flowteam;
-
-import com.fasterxml.jackson.annotation.JsonFormat;
-import lombok.Data;
-
-import java.util.Date;
-
-@Data
-public class FlowTeamStatisticUserDetailVO {
-
-    private String teamId;
-
-    private String teamMemberName;
-
-    private String inviteCode;
-
-    private String userErbanNo;
-
-    private String userNickName;
-
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
-    private Date signUpTime;
-
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
-    private Date firstChargeTime;
-
-    private Integer chargeCount;
-
-    /**
-     * 充值金额 单位：元
-     */
-    private Double chargeMoney;
-
-    /**
-     * 累计送礼额 单位：元
-     */
-    private Double totalSendGiftMoney;
-
-    /**
-     * 累计非背包送礼额 单位：元
-     */
-    private Double totalNoBackbagSendGiftMoney;
-
-    /**
-     * 累计背包送礼额 单位：元
-     */
-    private Double totalBackbagSendGiftMoney;
-
-    /**
-     * 注册时的ip
-     */
-    private String registerIp;
-
-    /**
-     * 用户手机号
-     */
-    private String phone;
-
-    /**
-     * 转赠次数
-     */
-    private Integer giveCount = 0;
-
-    /**
-     * 转赠金额
-     */
-    private Double giveMoney = 0D;
-
-    /**
-     * 邀请码填写类型
-     */
-    private String sourceName;
-}

accompany-admin/accompany-admin-sdk/src/main/java/com/accompany/admin/vo/flowteam/TeamStatisticBaseVO.java

@@ -1,39 +0,0 @@
-package com.accompany.admin.vo.flowteam;
-
-import lombok.Data;
-
-@Data
-public class TeamStatisticBaseVO {
-
-    private Integer newUserCount;
-
-    private Integer newChargeUserCount;
-
-    /**
-     * 付费转化率
-     */
-    private String chargeRate;
-
-    private Integer chargeCount;
-
-    /**
-     * 充值金额 单位：元
-     */
-    private Double chargeMoney;
-    /**
-     * 送礼金额 单位：元
-     */
-    private Double sendGiftMony;
-
-    private Double arpu;
-
-    /**
-     * 转赠次数
-     */
-    private Integer giveCount;
-
-    /**
-     * 转赠金额
-     */
-    private Double giveMoney;
-}

accompany-admin/accompany-admin-sdk/src/main/java/com/accompany/admin/vo/flowteam/UserWithFlowTeamInfoVO.java

@@ -1,29 +0,0 @@
-package com.accompany.admin.vo.flowteam;
-
-import com.accompany.core.model.Users;
-import lombok.Data;
-
-@Data
-public class UserWithFlowTeamInfoVO extends Users {
-
-    /**
-     * 引入组
-     */
-    private String teamId;
-
-    /**
-     * 引入人Id
-     */
-    private Long memberId;
-    /**
-     * 引入人
-     */
-    private String teamMemberName;
-
-    /**
-     * 是否在可补填邀请码范围内
-     */
-    private Boolean isInCanRefillInviteCodeTime;
-
-    private String groupName;
-}

accompany-admin/accompany-admin-sdk/src/main/java/com/accompany/admin/vo/gamepartner/GamePartnerOrderDayAdminVo.java

@@ -1,52 +0,0 @@
-package com.accompany.admin.vo.gamepartner;
-
-import com.alibaba.excel.annotation.ExcelProperty;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import java.math.BigDecimal;
-
-/**
- * @author: liaozetao
- * @date: 2023/8/24 14:53
- * @description:
- */
-@Data
-public class GamePartnerOrderDayAdminVo {
-
-    /**
-     * 日期
-     */
-    @ApiModelProperty("日期")
-    @ExcelProperty("日期")
-    private String orderTime;
-
-    /**
-     * 下单用户数
-     */
-    @ApiModelProperty("下单用户数")
-    @ExcelProperty("下单用户数")
-    private Integer orderNum;
-
-    /**
-     * 累积下单局数
-     */
-    @ApiModelProperty("累积下单局数")
-    @ExcelProperty("累积下单局数")
-    private Integer totalInning;
-
-    /**
-     * 累积下单次数
-     */
-    @ApiModelProperty("累积下单次数")
-    @ExcelProperty("累积下单次数")
-    private Integer orderCount;
-
-    /**
-     * 累积下单金额（钻）
-     */
-    @ApiModelProperty("累积下单金额（钻）")
-    @ExcelProperty("累积下单金额（钻）")
-    private BigDecimal totalAmount;
-
-}

accompany-admin/accompany-admin-sdk/src/main/java/com/accompany/admin/vo/gamepartner/GamePartnerOrderDayDetailAdminVo.java

@@ -1,77 +0,0 @@
-package com.accompany.admin.vo.gamepartner;
-
-import com.alibaba.excel.annotation.ExcelProperty;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-/**
- * @author: liaozetao
- * @date: 2023/8/24 15:39
- * @description:
- */
-@Data
-public class GamePartnerOrderDayDetailAdminVo {
-
-    /**
-     * 下单用户id
-     */
-    @ApiModelProperty("下单用户id")
-    @ExcelProperty("下单用户id")
-    private String fromErBanNo;
-
-    /**
-     * 下单用户昵称
-     */
-    @ApiModelProperty("下单用户昵称")
-    @ExcelProperty("下单用户昵称")
-    private String fromNick;
-
-    /**
-     * 接单用户id
-     */
-    @ApiModelProperty("接单用户id")
-    @ExcelProperty("接单用户id")
-    private String toErBanNo;
-
-    /**
-     * 接单用户昵称
-     */
-    @ApiModelProperty("接单用户昵称")
-    @ExcelProperty("接单用户昵称")
-    private String toNick;
-
-    /**
-     * 房主id
-     */
-    @ApiModelProperty("房主id")
-    @ExcelProperty("房主id")
-    private String hallErBanNo;
-
-    /**
-     * 房间名称
-     */
-    @ApiModelProperty("房间名称")
-    @ExcelProperty("房间名称")
-    private String hallRoomName;
-
-    /**
-     * 下单游戏
-     */
-    @ApiModelProperty("下单游戏")
-    @ExcelProperty("下单游戏")
-    private String gameName;
-
-    /**
-     * 下单金额（钻）
-     */
-    @ApiModelProperty("下单金额（钻）")
-    @ExcelProperty("下单金额（钻）")
-    private String amount;
-
-    /**
-     * 下单时间
-     */
-    @ApiModelProperty("下单时间")
-    @ExcelProperty("下单时间")
-    private String orderTime;
-}

accompany-admin/accompany-admin-sdk/src/main/java/com/accompany/admin/vo/gamepartner/UserGamePartnerInfoAdminVo.java

@@ -1,54 +0,0 @@
-package com.accompany.admin.vo.gamepartner;
-
-import com.accompany.business.model.gamepartner.UserGamePartner;
-import com.accompany.business.vo.gamepartner.UserGamePartnerInfoVo;
-import com.accompany.common.constant.Constant;
-import com.accompany.common.utils.DateTimeUtil;
-import com.accompany.core.model.Users;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import org.springframework.util.CollectionUtils;
-import org.springframework.util.StringUtils;
-
-import java.util.List;
-
-@ApiModel
-@Data
-public class UserGamePartnerInfoAdminVo {
-
-    @ApiModelProperty("uid")
-    private Long uid;
-    @ApiModelProperty("id")
-    private Long erbanNo;
-    @ApiModelProperty("昵称")
-    private String nick;
-    @ApiModelProperty("游戏信息")
-    private List<UserGamePartnerInfoVo> games;
-    @ApiModelProperty("状态")
-    private Boolean status;
-    @ApiModelProperty("更新时间")
-    private String updateTime;
-    @ApiModelProperty("操作人")
-    private String adminName;
-
-    public UserGamePartnerInfoAdminVo(){
-
-    }
-
-    public UserGamePartnerInfoAdminVo(UserGamePartner db, Users u, List<UserGamePartnerInfoVo> games, String adminName) {
-        this.uid = db.getUid();
-        if (null != u){
-            this.erbanNo = u.getErbanNo();
-            this.nick = u.getNick();
-        }
-        if (!CollectionUtils.isEmpty(games)){
-            this.games = games;
-        }
-        this.status = Constant.StatusV2.valid.equals(db.getStatus());
-        this.updateTime = DateTimeUtil.convertDate(db.getUpdateTime());
-        if (StringUtils.hasText(adminName)){
-            this.adminName = adminName;
-        }
-    }
-}

accompany-admin/accompany-admin-sdk/src/main/java/com/accompany/admin/vo/gift/GiftCompoundRewordVo.java

@@ -1,39 +0,0 @@
-package com.accompany.admin.vo.gift;
-
-import com.accompany.business.model.GiftCompoundReward;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-
-@Data
-@NoArgsConstructor
-public class GiftCompoundRewordVo {
-    @ApiModelProperty("合成奖励id")
-    private Integer id;
-    @ApiModelProperty("展示礼物id")
-    private Integer giftId;
-    @ApiModelProperty("展示礼物价值")
-    private Integer giftGoldPrice;
-    @ApiModelProperty("序号")
-    private Integer orderNo;
-    @ApiModelProperty("合成奖励消耗值")
-    private Integer expendValue;
-    @ApiModelProperty("合成奖励类型-1：普通合成奖励；2：限时合成奖励")
-    private Integer rewardType;
-    @ApiModelProperty("合成概率")
-    private Integer rate;
-    @ApiModelProperty("期望")
-    private Integer expectValue;
-    @ApiModelProperty("是否全服通知")
-    private Boolean serviceNotice = false;
-
-    public GiftCompoundReward toEntity() {
-        GiftCompoundReward entity = new GiftCompoundReward();
-        entity.setId(this.id);
-        entity.setGiftId(this.giftId);
-        entity.setOrderNo(this.orderNo);
-        entity.setExpendValue(this.expendValue);
-        entity.setRewardType(this.rewardType);
-        return entity;
-    }
-}

accompany-admin/accompany-admin-sdk/src/main/java/com/accompany/admin/vo/guild/GuildAdminVo.java

@@ -19,9 +19,16 @@ public class GuildAdminVo {
     @ApiModelProperty("公会长昵称")
     @ExcelProperty("公会长昵称")
     private String ownerNick;
+    @ExcelIgnore
+    private Integer partitionId;
     @ApiModelProperty("公会长分区")
     @ExcelProperty("公会长分区")
     private String ownerPartitionName;
+    @ExcelIgnore
+    private Integer regionId;
+    @ApiModelProperty("公会地区")
+    @ExcelProperty("公会地区")
+    private String regionName;
     @ApiModelProperty("公会长地区")
     @ExcelProperty("公会长地区")
     private String ownerRegionName;

accompany-admin/accompany-admin-sdk/src/main/java/com/accompany/admin/vo/guild/GuildCreateAdminVo.java

@@ -0,0 +1,18 @@
+package com.accompany.admin.vo.guild;
+
+import lombok.Data;
+
+@Data
+public class GuildCreateAdminVo {
+    private Long erbanNo;
+    private Integer id;
+    private String name;
+    private String avatar;
+    private String backgroundUrl;
+    private Integer memberNumLimit;
+    private String guildContactType;
+    private String guildContact;
+    private Long inviteErbanNo;
+    private Integer operatorId;
+    private Integer regionId;
+}

accompany-admin/accompany-admin-sdk/src/main/java/com/accompany/admin/vo/guild/GuildSettleRecordAdminVo.java

@@ -0,0 +1,69 @@
+package com.accompany.admin.vo.guild;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+
+/**
+ * 公会月政策结算明细表实体类
+ *
+ * @author 
+ * @since 2024-07-01
+ */
+@ApiModel
+@Data
+public class GuildSettleRecordAdminVo implements Serializable {
+
+  @ApiModelProperty("周期开始日期")
+  private String statDate;
+    @ApiModelProperty("周期结束日期")
+  private String endDate;
+    @ApiModelProperty("公会id")
+  private Integer guildId;
+    @ApiModelProperty("公会名称")
+  private String guildName;
+
+    @ApiModelProperty("分区id")
+  private Integer partitionId;
+    @ApiModelProperty("分区名称")
+  private String partitionDesc;
+
+    @ApiModelProperty("公会长uid")
+  private Long guildOwnerUid;
+    @ApiModelProperty("公会长id")
+  private Long guildOwnerErbanNo;
+    @ApiModelProperty("公会长地区id")
+    private Integer guildOwnerRegionId;
+    @ApiModelProperty("公会长地区名称")
+    private String guildOwnerRegionName;
+
+    @ApiModelProperty("主播人数")
+  private Integer memberCount;
+    @ApiModelProperty("活跃主播人数")
+  private Integer activeMemberCount;
+    @ApiModelProperty("总钻石流水")
+  private BigDecimal diamondNum;
+    @ApiModelProperty("薪资等级")
+  private String salaryLevel;
+  /**
+   * 公会长薪资比例
+   */
+  @ApiModelProperty("基础薪资比例")
+  private BigDecimal baseSalaryRatio;
+  /**
+   * 公会长工资
+   */
+  @ApiModelProperty("基础薪资")
+  private BigDecimal baseSalary;
+  @ApiModelProperty("活跃主播激励薪资比例")
+  private BigDecimal activeMemberBonusRatio;
+  @ApiModelProperty("活跃主播激励薪资")
+  private BigDecimal activeMemberBonus;
+  @ApiModelProperty("总薪资")
+  private BigDecimal totalSalary;
+
+
+}

accompany-admin/accompany-admin-sdk/src/main/java/com/accompany/admin/vo/home/HomeNewFriendAdminVo.java

@@ -1,58 +0,0 @@
-package com.accompany.admin.vo.home;
-
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import java.util.Date;
-
-/**
- * @author: liaozetao
- * @date: 2023/9/4 14:19
- * @description:
- */
-@Data
-public class HomeNewFriendAdminVo {
-
-    /**
-     * 用户UID
-     */
-    @ApiModelProperty("用户UID")
-    private Long uid;
-
-    /**
-     * 平台号
-     */
-    @ApiModelProperty("平台号")
-    private Long erbanNo;
-
-    /**
-     * 昵称
-     */
-    @ApiModelProperty("昵称")
-    private String nick;
-
-    /**
-     * 头像
-     */
-    @ApiModelProperty("头像")
-    private String avatar;
-
-    /**
-     * 性别
-     */
-    @ApiModelProperty("性别")
-    private Byte gender;
-
-    /**
-     * 创建时间
-     */
-    @ApiModelProperty("创建时间")
-    private Date createTime;
-
-    /**
-     * 失效时间
-     */
-    @ApiModelProperty("失效时间")
-    private Date expireTime;
-
-}

accompany-admin/accompany-admin-sdk/src/main/java/com/accompany/admin/vo/linearlypool/LinearlyPoolDeployResultVO.java

@@ -1,15 +0,0 @@
-package com.accompany.admin.vo.linearlypool;
-
-import lombok.Data;
-
-@Data
-public class LinearlyPoolDeployResultVO {
-    /**
-     * 当前奖品线id
-     */
-    private Long currentPoolLineId;
-    /**
-     * 发布后生效的奖品线id
-     */
-    private Long willActiveLineId;
-}

accompany-admin/accompany-admin-sdk/src/main/java/com/accompany/admin/vo/linearlypool/LinearlyPoolDrawRecordStatisVo.java

@@ -1,17 +0,0 @@
-package com.accompany.admin.vo.linearlypool;
-
-import lombok.Data;
-
-import java.util.Date;
-
-@Data
-public class LinearlyPoolDrawRecordStatisVo {
-    private Date createTime;
-    private Integer countNum;
-    private Long userTotalPay;
-    private Long totalPlatformValue;
-    private Long totalActualValue;
-    private Long totalGiftActualValue;
-    private Long totalNotGiftActualValue;
-    private Long totalRealGiftActualValue;
-}

accompany-admin/accompany-admin-sdk/src/main/java/com/accompany/admin/vo/linearlypool/LinearlyPoolDrawRecordVO.java

@@ -1,27 +0,0 @@
-/*
- * 文 件 名:  LinearlyPoolDrawRecordVO
- * 版    权:
- * 描    述:  <描述>
- * 创建时间:  2021/9/17
- * 修改人:
- * 修改内容:
- * 修改时间:
- */
-package com.accompany.admin.vo.linearlypool;
-
-import com.accompany.business.model.linearlypool.LinearlyPrizePoolDrawLineItem;
-import lombok.Data;
-
-/**
- * <br>类描述: 抽奖记录vo
- * <br>功能详细描述:
- *
- * @date [2021/9/17]
- */
-@Data
-public class LinearlyPoolDrawRecordVO extends LinearlyPrizePoolDrawLineItem {
-
-    private Long erbanNo;
-
-    private String nick;
-}

accompany-admin/accompany-admin-sdk/src/main/java/com/accompany/admin/vo/linearlypool/LinearlyPoolItemAdminPageVO.java

@@ -1,37 +0,0 @@
-package com.accompany.admin.vo.linearlypool;
-
-import lombok.Data;
-
-import java.util.List;
-
-@Data
-public class LinearlyPoolItemAdminPageVO {
-
-    /**
-     * 普通礼物组
-     */
-    private PrizeGroupVO normalPrizeGroup;
-
-    /**
-     * 高级礼物组
-     */
-    private PrizeGroupVO seniorPrizeGroup;
-
-    /**
-     * 已发布的普通礼物组列表
-     */
-    private List<PrizeItemVO> deployedNormalPrizes;
-    /**
-     * 已发布的高级礼物组列表
-     */
-    private List<PrizeItemVO> deployedSeniorPrizes;
-
-    /**
-     * 当前奖品线id
-     */
-    private Long currentPoolLineId;
-    /**
-     * 已生成的最大奖品线id
-     */
-    private Long maxLineId;
-}

accompany-admin/accompany-admin-sdk/src/main/java/com/accompany/admin/vo/linearlypool/PrizeGroupVO.java

@@ -1,19 +0,0 @@
-package com.accompany.admin.vo.linearlypool;
-
-import lombok.Data;
-
-import java.util.List;
-
-@Data
-public class PrizeGroupVO {
-
-    /**
-     * 奖品列表
-     */
-    private List<PrizeItemVO> prizeItems;
-
-    /**
-     * 是否未发布
-     */
-    private Boolean isUndeploy;
-}

accompany-admin/accompany-admin-sdk/src/main/java/com/accompany/admin/vo/linearlypool/PrizeItemVO.java

@@ -1,24 +0,0 @@
-package com.accompany.admin.vo.linearlypool;
-
-import com.accompany.business.model.linearlypool.LinearlyPrizePoolItem;
-import lombok.Data;
-
-@Data
-public class PrizeItemVO extends LinearlyPrizePoolItem {
-
-    /**
-     * 奖品类型 see {@link com.accompany.business.constant.PrizeTypeEnum}
-     */
-    private Byte prizeType;
-
-    /**
-     * 奖品名称
-     */
-    private String prizeName;
-
-    /**
-     * 平台价值
-     */
-    private Integer platformValue;
-
-}

accompany-admin/accompany-admin-sdk/src/main/java/com/accompany/admin/vo/linearlypool/UserDrawStatisAdminVo.java

@@ -1,17 +0,0 @@
-package com.accompany.admin.vo.linearlypool;
-
-import lombok.Data;
-
-@Data
-public class UserDrawStatisAdminVo {
-
-    private Long uid;
-    private String nick;
-    private Long erbanNo;
-    private Long totalPurchaseMoney;
-    private Long totalDrawMoney;
-    private Long totalPlatformValue;
-    private Long totalActualValue;
-    private Long deviation;
-
-}

accompany-admin/accompany-admin-sdk/src/main/java/com/accompany/admin/vo/luckysea/LuckySeaActAdminRecordVo.java

@@ -1,34 +0,0 @@
-/*
- * 文 件 名:  LuckySeaActAdminRecordVo
- * 版    权:
- * 描    述:  <描述>
- * 创建人:  H1
- * 创建时间:  2021/1/12
- * 修改人:
- * 修改内容:
- * 修改时间:
- */
-package com.accompany.admin.vo.luckysea;
-
-import lombok.Data;
-
-import java.util.Date;
-
-/**
- * <br>类描述:
- * <br>功能详细描述:
- *
- * @author H1
- * @date [2021/1/12]
- */
-@Data
-public class LuckySeaActAdminRecordVo {
-    private String roundId;
-    private Date startTime;
-    private Date endTime;
-    private Integer memberNum;
-    private Long userInputPieceNum;
-    private Long prizePieceNum;
-    private Double ticket;
-    private String prizeName;
-}

accompany-admin/accompany-admin-sdk/src/main/java/com/accompany/admin/vo/luckysea/LuckySeaActAdminRoundDetailVo.java

@@ -1,29 +0,0 @@
-/*
- * 文 件 名:  LuckySeaActAdminRoundDetailVo
- * 版    权:
- * 描    述:  <描述>
- * 创建人:  H1
- * 创建时间:  2021/1/12
- * 修改人:
- * 修改内容:
- * 修改时间:
- */
-package com.accompany.admin.vo.luckysea;
-
-import lombok.Data;
-
-/**
- * <br>类描述:
- * <br>功能详细描述:
- *
- * @author H1
- * @date [2021/1/12]
- */
-@Data
-public class LuckySeaActAdminRoundDetailVo {
-    private Long uid;
-    private Long erbanNo;
-    private String nick;
-    private Long costPieceNum;
-    private Long prizePieceNum;
-}

accompany-admin/accompany-admin-sdk/src/main/java/com/accompany/admin/vo/luckysea/LuckySeaActAdminUserDrawRecord.java

@@ -1,33 +0,0 @@
-/*
- * 文 件 名:  LuckySeaActAdminUserDrawRecord
- * 版    权:
- * 描    述:  <描述>
- * 创建人:  H1
- * 创建时间:  2021/1/12
- * 修改人:
- * 修改内容:
- * 修改时间:
- */
-package com.accompany.admin.vo.luckysea;
-
-import lombok.Data;
-
-import java.util.Date;
-
-/**
- * <br>类描述:
- * <br>功能详细描述:
- *
- * @author H1
- * @date [2021/1/12]
- */
-@Data
-public class LuckySeaActAdminUserDrawRecord {
-    private Long uid;
-    private Long erbanNo;
-    private String nick;
-    private String roundId;
-    private Date endTime;
-    private Long costPieceNum;
-    private Long prizePieceNum;
-}

accompany-admin/accompany-admin-sdk/src/main/java/com/accompany/admin/vo/luckysea/LuckySeaActPlatformStatVo.java

@@ -1,40 +0,0 @@
-/*
- * 文 件 名:  LuckySeaActPlatformStatVo
- * 版    权:
- * 描    述:  <描述>
- * 创建人:  H1
- * 创建时间:  2021/1/11
- * 修改人:
- * 修改内容:
- * 修改时间:
- */
-package com.accompany.admin.vo.luckysea;
-
-import com.alibaba.excel.annotation.ExcelProperty;
-import lombok.Data;
-
-/**
- * <br>类描述: 深海奇缘活动平台数据统计vo
- * <br>功能详细描述:
- *
- * @author H1
- * @date [2021/1/11]
- */
-@Data
-public class LuckySeaActPlatformStatVo {
-
-    @ExcelProperty("日期")
-    private String queryDate;
-    @ExcelProperty("总人数")
-    private Integer memberNum;
-    @ExcelProperty("总人次")
-    private Integer totalPlayTimes;
-    @ExcelProperty("总轮数")
-    private Integer roundNum;
-    @ExcelProperty("总投入")
-    private Long totalPiece;
-    @ExcelProperty("总平台价值")
-    private Long totalPlatformValue;
-    @ExcelProperty("门票")
-    private Double totalTicket;
-}

accompany-admin/accompany-admin-sdk/src/main/java/com/accompany/admin/vo/luckysea/LuckySeaItemGroupAdminVo.java

@@ -1,31 +0,0 @@
-package com.accompany.admin.vo.luckysea;
-
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-/**
- * <br>类描述: 深海奇缘活动奖项item
- * <br>功能详细描述:
- *
- * @author H1
- * @date [2020/12/30]
- */
-@Data
-@ApiModel
-public class LuckySeaItemGroupAdminVo {
-
-    @ApiModelProperty("id")
-    private Long id;
-
-    private String name;
-
-    @ApiModelProperty("itemIds")
-    private String itemIds;
-
-    @ApiModelProperty("itemNames")
-    private String itemNames;
-
-    private Byte status;
-
-}

accompany-admin/accompany-admin-sdk/src/main/java/com/accompany/admin/vo/miniGame/MiniGameLudoUserRecordAdminVo.java

@@ -0,0 +1,63 @@
+package com.accompany.admin.vo.miniGame;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.math.BigDecimal;
+
+@ApiModel
+@Data
+public class MiniGameLudoUserRecordAdminVo {
+
+    @ApiModelProperty("记录id")
+    private Long id;
+    @ApiModelProperty("uid")
+    private Long uid;
+    @ApiModelProperty("用户id")
+    private Long erbanNo;
+    @ApiModelProperty("用户名")
+    private String nick;
+    @ApiModelProperty("分区id")
+    private Integer partitionId;
+    @ApiModelProperty("分区")
+    private String partitionDesc;
+
+    @ApiModelProperty("入口")
+    private Integer entrance;
+    @ApiModelProperty("入口描述")
+    private String entranceDesc;
+
+    @ApiModelProperty("房间uid")
+    private Long roomUid;
+    @ApiModelProperty("门票")
+    private BigDecimal ticket;
+    @ApiModelProperty("排名")
+    private Integer rank;
+    @ApiModelProperty("是否赢家")
+    private Boolean isWinner;
+    @ApiModelProperty("是否逃跑")
+    private Boolean isEscaped;
+    @ApiModelProperty("是否托管")
+    private Boolean isManaged;
+
+    @ApiModelProperty("游戏id")
+    private String mgId;
+    @ApiModelProperty("游戏名称")
+    private String mgName;
+    @ApiModelProperty("轮次id")
+    private String roundId;
+    @ApiModelProperty("游戏模式")
+    private Integer mode;
+    @ApiModelProperty("本轮玩家数")
+    private Integer playerNum;
+    @ApiModelProperty("开始时间")
+    private String startTime;
+    @ApiModelProperty("结束时间")
+    private String endTime;
+    @ApiModelProperty("游戏时长(秒)")
+    private Integer durationSecond;
+    @ApiModelProperty("游戏时长(格式化)")
+    private String durationFormatter;
+
+}

accompany-admin/accompany-admin-sdk/src/main/java/com/accompany/admin/vo/miniGame/MiniGameLudoUserRecordStatAdminVo.java

@@ -0,0 +1,29 @@
+package com.accompany.admin.vo.miniGame;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+@NoArgsConstructor
+@ApiModel
+@Data
+public class MiniGameLudoUserRecordStatAdminVo {
+
+    @ApiModelProperty("总游戏时长（秒）")
+    private Integer totalDurationSecond = 0;
+    @ApiModelProperty("总游戏时长（格式化）")
+    private String totalDurationFormatter = "0";
+    @ApiModelProperty("游戏次数")
+    private Integer roundCount = 0;
+    @ApiModelProperty("付费游戏次数")
+    private Integer paidRoundCount = 0;
+
+    @ApiModelProperty("记录分页")
+    public Page<MiniGameLudoUserRecordAdminVo> page;
+
+    public MiniGameLudoUserRecordStatAdminVo(Page<MiniGameLudoUserRecordAdminVo> page) {
+        this.page = page;
+    }
+}

accompany-admin/accompany-admin-sdk/src/main/java/com/accompany/admin/vo/official/OfficialBrowseCountVo.java

@@ -1,67 +0,0 @@
-package com.accompany.admin.vo.official;
-
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-/**
- * @author: liaozetao
- * @date: 2024/1/18 14:26
- * @description:
- */
-@Data
-public class OfficialBrowseCountVo {
-
-    /**
-     * 日期
-     */
-    @ApiModelProperty("日期")
-    private String dateTime;
-
-    /**
-     * 无线官网UV
-     */
-    @ApiModelProperty("无线官网UV")
-    private Integer clientUv = 0;
-
-    /**
-     * 无线官网PV
-     */
-    @ApiModelProperty("无线官网PV")
-    private Integer clientPv = 0;
-
-    /**
-     * 无线 iOS下载点击次数
-     */
-    @ApiModelProperty("无线 iOS下载点击次数")
-    private Integer iosDownloadPv = 0;
-
-    /**
-     * 无线 安卓下载点击次数
-     */
-    @ApiModelProperty("无线 安卓下载点击次数")
-    private Integer androidDownloadPv = 0;
-
-    /**
-     * PC官网UV
-     */
-    @ApiModelProperty("PC官网UV")
-    private Integer pcUv = 0;
-
-    /**
-     * PC官网PV
-     */
-    @ApiModelProperty("PC官网PV")
-    private Integer pcPv = 0;
-
-    /**
-     * PC iOS下载点击次数
-     */
-    @ApiModelProperty("PC iOS下载点击次数")
-    private Integer pcIosDownloadPv = 0;
-
-    /**
-     * PC 安卓下载点击次数
-     */
-    @ApiModelProperty("PC 安卓下载点击次数")
-    private Integer pcAndroidDownloadPv = 0;
-}

accompany-admin/accompany-admin-sdk/src/main/java/com/accompany/admin/vo/room/RoomDaySendRankRewardRecordAdminVo.java

@@ -0,0 +1,69 @@
+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;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.format.NumberFormat;
+
+import java.math.BigDecimal;
+import java.util.Date;
+
+@Data
+@ApiModel("房间日流水奖励记录")
+public class RoomDaySendRankRewardRecordAdminVo {
+
+    @ExcelProperty("统计日期")
+    @ApiModelProperty("统计日期")
+    private String statDate;
+
+    @ExcelIgnore
+    @ApiModelProperty("房间UID")
+    private Long roomUid;
+
+    @ExcelProperty("房间id")
+    @ApiModelProperty("房间id")
+    private Long erbanNo;
+
+    @ExcelProperty("房间标题")
+    @ApiModelProperty("房间标题")
+    private String roomTitle;
+
+    @ExcelIgnore
+    @ApiModelProperty("分区ID")
+    private Integer partitionId;
+
+    @ExcelProperty("分区描述")
+    @ApiModelProperty("分区描述")
+    private String partitionIdDesc;
+
+    @ExcelProperty("地区名称")
+    @ApiModelProperty("地区名称")
+    private String regionName;
+
+    @ExcelProperty("房间流水金额")
+    @NumberFormat("#.##")
+    @ApiModelProperty("房间流水金额")
+    private BigDecimal serialValue;
+
+    @ExcelProperty("奖励档位ID")
+    @ApiModelProperty("奖励档位ID")
+    private Long rewardId;
+
+    @ExcelProperty("等级名称")
+    @ApiModelProperty("等级名称")
+    private String levelName;
+
+    @ExcelProperty("目标获得金币")
+    @ApiModelProperty("目标获得金币")
+    private Long ownerReward;
+
+    @ExcelProperty("已获得金币")
+    @ApiModelProperty("已获得金币")
+    private Long ownerReceiveReward;
+
+    @ExcelProperty("领取时间")
+    @ApiModelProperty("领取时间")
+    private String receiveTime;
+}

accompany-admin/accompany-admin-sdk/src/main/java/com/accompany/admin/vo/room/RoomDaySendRankRewardUserRecordAdminVo.java

@@ -0,0 +1,76 @@
+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("用户ID")
+    @ApiModelProperty("用户ID")
+    private Long uid;
+
+    @ExcelProperty("用户erbanNo")
+    @ApiModelProperty("用户erbanNo")
+    private Long erbanNo;
+
+    @ExcelProperty("用户昵称")
+    @ApiModelProperty("用户昵称")
+    private String nick;
+
+    @ExcelProperty("分区ID")
+    @ApiModelProperty("分区ID")
+    private Integer partitionId;
+
+    @ExcelProperty("分区描述")
+    @ApiModelProperty("分区描述")
+    private String partitionDesc;
+
+    @ExcelProperty("国家ID")
+    @ApiModelProperty("国家ID")
+    private Integer regionId;
+
+    @ExcelProperty("国家描述")
+    @ApiModelProperty("国家描述")
+    private String regionDesc;
+
+    @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 String receiveTime;
+
+}

accompany-admin/accompany-admin-sdk/src/main/java/com/accompany/admin/vo/room/RoomWeekDiamondRewardRecordAdminVo.java

@@ -0,0 +1,66 @@
+package com.accompany.admin.vo.room;
+
+import com.alibaba.excel.annotation.ExcelIgnore;
+import com.alibaba.excel.annotation.ExcelProperty;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.math.BigDecimal;
+import java.util.Date;
+
+@ApiModel("房间周流水奖励记录")
+@Data
+public class RoomWeekDiamondRewardRecordAdminVo {
+    @ExcelIgnore
+    private Integer partitionId;
+    @ExcelProperty("分区")
+    @ApiModelProperty("分区")
+    private String partitionIdDesc;
+    @ExcelProperty("房间UID")
+    private Long roomUid;
+    @ExcelProperty("房间ID")
+    @ApiModelProperty("房间ID")
+    private Long erbanNo;
+    @ExcelProperty("房间昵称")
+    @ApiModelProperty("房间昵称")
+    private String roomName;
+    @ExcelProperty("国家")
+    @ApiModelProperty("国家")
+    private String regionName;
+    @ExcelProperty("日期")
+    @ApiModelProperty("日期")
+    private String statDate;
+    @ExcelProperty("金币流水")
+    @ApiModelProperty("金币流水")
+    private BigDecimal diamondNum;
+    @ExcelProperty("钻石流水")
+    @ApiModelProperty("钻石流水")
+    private BigDecimal goldNum;
+    @ExcelIgnore
+    @ApiModelProperty("奖励等级id")
+    private Integer levelId;
+    @ExcelProperty("等级名称")
+    @ApiModelProperty("等级名称")
+    private String levelName;
+    @ExcelProperty("对应流水发放金币")
+    @ApiModelProperty("对应流水发放金币")
+    private BigDecimal rewardGold;
+    @ExcelProperty("发放状态：0:不可发放，1未发放，2已发放")
+    @ApiModelProperty("发放状态：0:不可发放，1未发放，2已发放")
+    private Byte status;
+    @ExcelProperty("操作人")
+    @ApiModelProperty("操作人")
+    private String operator;
+    @ExcelIgnore
+    private Date createTime;
+    @ApiModelProperty("发放时间")
+    @ExcelProperty("操作人")
+    private String sendTime;
+    @ApiModelProperty("公会长ID")
+    @ExcelProperty("公会长ID")
+    private Long ownerErbanNo;
+    @ApiModelProperty("公会ID")
+    @ExcelProperty("公会ID")
+    private Integer guildId;
+}

accompany-admin/accompany-admin-sdk/src/main/java/com/accompany/admin/vo/treasure/SeizeTreasureConvertItemAdminVo.java

@@ -1,74 +0,0 @@
-package com.accompany.admin.vo.treasure;
-
-import cn.hutool.core.util.StrUtil;
-import com.accompany.business.model.treasure.SeizeTreasureConvertItem;
-import com.alibaba.fastjson.JSONArray;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import java.util.Collections;
-import java.util.List;
-
-/**
- * @author: liaozetao
- * @date: 2023/9/6 14:52
- * @description:
- */
-@Data
-@ApiModel
-public class SeizeTreasureConvertItemAdminVo extends SeizeTreasureConvertItem {
-
-    /**
-     * 奖品类型
-     */
-    @ApiModelProperty("奖品类型")
-    private String rewardType;
-
-    /**
-     * 奖品名称
-     */
-    @ApiModelProperty("奖品名称")
-    private String rewardName;
-
-    /**
-     * 奖品价值
-     */
-    @ApiModelProperty("奖品价值")
-    private Integer rewardValue;
-
-    /**
-     * 关联ID
-     */
-    @ApiModelProperty("关联ID")
-    private Long rewardRefId;
-
-    /**
-     * 精灵ID
-     */
-    @ApiModelProperty("精灵ID")
-    private String propIdsJson;
-
-    /**
-     * 精灵数量
-     */
-    @ApiModelProperty("精灵数量")
-    private String propNumsJson;
-
-
-    @Override
-    public List<Long> getPropIds() {
-        if (StrUtil.isEmpty(propIdsJson)) {
-            return Collections.emptyList();
-        }
-        return JSONArray.parseArray(propIdsJson, Long.class);
-    }
-
-    @Override
-    public List<Integer> getPropNums() {
-        if (StrUtil.isEmpty(propNumsJson)) {
-            return Collections.emptyList();
-        }
-        return JSONArray.parseArray(propNumsJson, Integer.class);
-    }
-}

accompany-admin/accompany-admin-sdk/src/main/java/com/accompany/admin/vo/treasure/SeizeTreasureConvertRecordAdminVo.java

@@ -1,55 +0,0 @@
-package com.accompany.admin.vo.treasure;
-
-import com.fasterxml.jackson.annotation.JsonFormat;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import java.util.Date;
-
-/**
- * @author: liaozetao
- * @date: 2023/9/7 11:10
- * @description:
- */
-@Data
-@ApiModel
-public class SeizeTreasureConvertRecordAdminVo {
-
-    /**
-     * 用户ID
-     */
-    @ApiModelProperty("用户ID")
-    private Long erbanNo;
-
-    /**
-     * 用户昵称
-     */
-    @ApiModelProperty("用户昵称")
-    private String nick;
-
-    /**
-     * 召唤类型
-     */
-    @ApiModelProperty("召唤类型")
-    private Integer convertType;
-
-    /**
-     * 获得物品名称
-     */
-    @ApiModelProperty("获得物品名称")
-    private String rewardName;
-
-    /**
-     * 获得物品价值
-     */
-    @ApiModelProperty("获得物品价值（钻）")
-    private Integer rewardShowValue;
-
-    /**
-     * 召唤时间
-     */
-    @ApiModelProperty("召唤时间")
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
-    private Date createTime;
-}

accompany-admin/accompany-admin-sdk/src/main/java/com/accompany/admin/vo/treasure/SeizeTreasureDailyRecordVo.java

@@ -1,11 +0,0 @@
-package com.accompany.admin.vo.treasure;
-
-import com.accompany.business.vo.treasure.record.SeizeTreasureStaticVo;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-
-@Data
-@NoArgsConstructor
-public class SeizeTreasureDailyRecordVo extends SeizeTreasureStaticVo {
-   private String dateStr;
-}

accompany-admin/accompany-admin-sdk/src/main/java/com/accompany/admin/vo/treasure/SeizeTreasurePoolDrawRecordAdminVo.java

@@ -1,52 +0,0 @@
-package com.accompany.admin.vo.treasure;
-
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import java.math.BigDecimal;
-
-/**
- * @author: liaozetao
- * @date: 2023/9/7 14:19
- * @description:
- */
-@Data
-@ApiModel
-public class SeizeTreasurePoolDrawRecordAdminVo {
-
-    /**
-     * 用户UID
-     */
-    @ApiModelProperty("用户UID")
-    private Long uid;
-
-    /**
-     * 平台号
-     */
-    @ApiModelProperty("平台号")
-    private Long erbanNo;
-
-    /**
-     * 昵称
-     */
-    @ApiModelProperty("昵称")
-    private String nick;
-
-    /**
-     * 历史抽奖总金额
-     */
-    @ApiModelProperty("历史抽奖总金额")
-    private BigDecimal drawAmount = BigDecimal.ZERO;
-
-    /**
-     * 历史获奖平台价值
-     */
-    @ApiModelProperty("历史获奖平台价值")
-    private BigDecimal rewardAmount = BigDecimal.ZERO;
-
-
-    public BigDecimal getDiffAmount() {
-        return this.drawAmount.subtract(this.rewardAmount);
-    }
-}

accompany-admin/accompany-admin-sdk/src/main/java/com/accompany/admin/vo/treasure/SeizeTreasurePoolItemAdminVo.java

@@ -1,40 +0,0 @@
-package com.accompany.admin.vo.treasure;
-
-import com.accompany.business.model.treasure.SeizeTreasurePoolItem;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-/**
- * @author: liaozetao
- * @date: 2023/10/10 14:11
- * @description:
- */
-@Data
-@ApiModel
-public class SeizeTreasurePoolItemAdminVo extends SeizeTreasurePoolItem {
-
-    /**
-     * 奖品名称
-     */
-    @ApiModelProperty("奖品名称")
-    private String rewardName;
-
-    /**
-     * 奖品价值
-     */
-    @ApiModelProperty("奖品价值")
-    private Integer rewardValue;
-
-    /**
-     * 奖品展示价值
-     */
-    @ApiModelProperty("奖品展示价值")
-    private Integer rewardShowValue;
-
-    /**
-     * 关联ID
-     */
-    @ApiModelProperty("关联ID")
-    private Long rewardRefId;
-}

accompany-admin/accompany-admin-sdk/src/main/java/com/accompany/admin/vo/treasure/SeizeTreasurePoolItemCountAdminVo.java

@@ -1,51 +0,0 @@
-package com.accompany.admin.vo.treasure;
-
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-/**
- * @author: liaozetao
- * @date: 2023/10/13 16:59
- * @description:
- */
-@Data
-@ApiModel
-public class SeizeTreasurePoolItemCountAdminVo {
-
-    /**
-     * 礼物个数
-     */
-    @ApiModelProperty("礼物个数")
-    private Double giftCount = 0D;
-
-    /**
-     * 礼物价值
-     */
-    @ApiModelProperty("礼物价值")
-    private Double giftValue = 0D;
-
-    /**
-     * 奖池线包含组数
-     */
-    @ApiModelProperty("奖池线包含组数")
-    private Double rewardLineCount = 0D;
-
-    /**
-     * 奖池线礼物数
-     */
-    @ApiModelProperty("奖池线礼物数")
-    private Double rewardLineNum = 0D;
-
-    /**
-     * 总礼物价值
-     */
-    @ApiModelProperty("总礼物价值")
-    private Double totalGiftValue = 0D;
-
-    /**
-     * 单线比
-     */
-    @ApiModelProperty("单线比")
-    private Double singleLineRatio = 0D;
-}