From 4564cfbbf2abeaa31900eb77d7996305e2c64164 Mon Sep 17 00:00:00 2001 From: hokli <2629910752@qq.com> Date: Tue, 14 Oct 2025 19:36:03 +0800 Subject: [PATCH] =?UTF-8?q?boom=E5=90=8E=E5=8F=B0=E5=88=86=E5=8C=BA?= =?UTF-8?q?=E6=94=AF=E6=8C=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../RoomBoomAwardRecordAdminController.java | 25 ++++++++--------- .../room/RoomBoomSignMapper.java | 6 ++++ .../service/room/RoomBoomBizService.java | 3 -- .../service/room/RoomBoomSignService.java | 4 +++ .../room/impl/RoomBoomSignServiceImpl.java | 6 ++++ .../sqlmappers/RoomBoomSignMapper.xml | 28 +++++++++++++++++++ 6 files changed, 56 insertions(+), 16 deletions(-) diff --git a/accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/boom/RoomBoomAwardRecordAdminController.java b/accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/boom/RoomBoomAwardRecordAdminController.java index 74e987d15..56bd772f3 100644 --- a/accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/boom/RoomBoomAwardRecordAdminController.java +++ b/accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/boom/RoomBoomAwardRecordAdminController.java @@ -73,34 +73,33 @@ public class RoomBoomAwardRecordAdminController extends BaseController { //1 创建IPage分页对象,设置分页参数 IPage page=new Page<>(params.getPageNo(),params.getPageSize()); - LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); + Long uid = null; + Long roomUid = null; if (params.getRoomErbanNo() != null){ Users erbanNo = usersService.getUserByErbanNo(params.getRoomErbanNo()); if (erbanNo == null) { throw new AdminServiceException(BusiStatus.SERVERERROR, "房间id不存在"); } - wrapper.eq(RoomBoomSign::getRoomUid,erbanNo.getUid()); + roomUid = erbanNo.getUid(); } if (params.getErbanNo() != null){ Users erbanNo = usersService.getUserByErbanNo(params.getErbanNo()); if (erbanNo == null) { throw new AdminServiceException(BusiStatus.SERVERERROR, "触发者id不存在"); } - wrapper.eq(RoomBoomSign::getUid,erbanNo.getUid()); + uid = erbanNo.getUid(); } - if (params.getLevel() != null){ - wrapper.eq(RoomBoomSign::getLevel,params.getLevel()); + Date startTime = null, endTime = null; + if (StringUtils.isNotEmpty(params.getStartTime())) { + startTime = DateUtil.parseDateTime(params.getStartTime()); } - if (StringUtils.isNotEmpty(params.getStartTime())){ - wrapper.ge(RoomBoomSign::getCreateTime, (Date)DateUtil.parseDateTime(params.getStartTime())); + if (StringUtils.isNotEmpty(params.getEndTime())) { + endTime = DateUtil.parseDateTime(params.getEndTime()); } - if (StringUtils.isNotEmpty(params.getEndTime())){ - wrapper.le(RoomBoomSign::getCreateTime, (Date)DateUtil.parseDateTime(params.getEndTime())); - } - wrapper.eq(RoomBoomSign::getStatus,2); - wrapper.orderByDesc(RoomBoomSign::getId); //2 执行分页查询 - IPage boomSignIPage = roomBoomSignService.page(page, wrapper); + IPage boomSignIPage = roomBoomSignService.list(page, uid, roomUid, params.getLevel(), + startTime, endTime, params.getPartitionId()); + Page resultVo = new Page<>(); resultVo.setTotal(boomSignIPage.getTotal()); List roomBoomSignVOS = new ArrayList<>(); diff --git a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/mybatismapper/room/RoomBoomSignMapper.java b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/mybatismapper/room/RoomBoomSignMapper.java index 8f5f23def..bb920f350 100644 --- a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/mybatismapper/room/RoomBoomSignMapper.java +++ b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/mybatismapper/room/RoomBoomSignMapper.java @@ -2,8 +2,10 @@ package com.accompany.business.mybatismapper.room; import com.accompany.business.model.room.RoomBoomSign; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.core.metadata.IPage; import org.apache.ibatis.annotations.Param; +import java.util.Date; import java.util.List; /** @@ -34,4 +36,8 @@ public interface RoomBoomSignMapper extends BaseMapper { * @return 开奖情况 */ RoomBoomSign getOneByRecordIdAndLevel(@Param("recordId") Long recordId, @Param("level") Integer level); + + IPage list(@Param("page") IPage page, @Param("roomUid") Long roomUid, @Param("uid") Long uid, + @Param("level") Integer level, @Param("startTime") Date startTime, @Param("endTime") Date endTime, + @Param("partitionId") Integer partitionId); } diff --git a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/room/RoomBoomBizService.java b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/room/RoomBoomBizService.java index 4170fde90..4d86e139e 100644 --- a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/room/RoomBoomBizService.java +++ b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/room/RoomBoomBizService.java @@ -4,7 +4,6 @@ import cn.hutool.core.date.DateUtil; import com.accompany.business.constant.RoomBoomConstant; import com.accompany.business.dto.room.RoomBoomPrizeMsgDTO; import com.accompany.business.message.GiftMessage; -import com.accompany.business.message.SuperLuckyGiftDiamondIncomeMessage; import com.accompany.business.model.room.RoomBoomLevel; import com.accompany.business.model.room.RoomBoomLevelAward; import com.accompany.business.model.room.RoomBoomSign; @@ -27,7 +26,6 @@ import com.alibaba.fastjson.JSONObject; import com.google.common.collect.Lists; import com.google.gson.Gson; import com.google.gson.reflect.TypeToken; -import lombok.Data; import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.StringUtils; import org.redisson.api.*; @@ -44,7 +42,6 @@ import org.springframework.util.CollectionUtils; import java.math.BigDecimal; import java.time.ZonedDateTime; import java.util.*; -import java.util.function.BiFunction; import java.util.function.Function; import java.util.stream.Collectors; diff --git a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/room/RoomBoomSignService.java b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/room/RoomBoomSignService.java index 80b4aebbf..c266168a4 100644 --- a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/room/RoomBoomSignService.java +++ b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/room/RoomBoomSignService.java @@ -1,8 +1,10 @@ package com.accompany.business.service.room; import com.accompany.business.model.room.RoomBoomSign; +import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.service.IService; +import java.util.Date; import java.util.List; @@ -41,5 +43,7 @@ public interface RoomBoomSignService extends IService { * @return 记录 */ RoomBoomSign getOneByRecordIdAndLevel(Long recordId, Integer level); + + IPage list(IPage page, Long roomUid, Long uid, Integer level, Date startTime, Date endTime, Integer partitionId); } diff --git a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/room/impl/RoomBoomSignServiceImpl.java b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/room/impl/RoomBoomSignServiceImpl.java index 0af3714d8..6e2165560 100644 --- a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/room/impl/RoomBoomSignServiceImpl.java +++ b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/room/impl/RoomBoomSignServiceImpl.java @@ -23,6 +23,7 @@ import com.accompany.core.model.Users; import com.accompany.core.util.I18NMessageSourceUtil; import com.alibaba.fastjson.JSON; import com.alibaba.nacos.common.utils.CollectionUtils; +import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import lombok.extern.slf4j.Slf4j; import org.redisson.api.RList; @@ -382,6 +383,11 @@ public class RoomBoomSignServiceImpl extends ServiceImpl list(IPage page, Long roomUid, Long uid, Integer level, Date startTime, Date endTime, Integer partitionId) { + return baseMapper.list(page, roomUid, uid, level, startTime, endTime, partitionId); + } + private void sendAward(RoomBoomLevelAward award, Long uid, Long roomUid) { try { RewardDto rewardDto = new RewardDto(); diff --git a/accompany-business/accompany-business-service/src/main/resources/accompany/sqlmappers/RoomBoomSignMapper.xml b/accompany-business/accompany-business-service/src/main/resources/accompany/sqlmappers/RoomBoomSignMapper.xml index a8bf6a1ae..aeaf90a0b 100644 --- a/accompany-business/accompany-business-service/src/main/resources/accompany/sqlmappers/RoomBoomSignMapper.xml +++ b/accompany-business/accompany-business-service/src/main/resources/accompany/sqlmappers/RoomBoomSignMapper.xml @@ -33,4 +33,32 @@ select * from room_boom_sign where record_id = #{recordId} and level = #{level} order by id limit 1 + + \ No newline at end of file