diff --git a/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/mapper/room/RoomWeekDiamondRewardRecordAdminMapper.java b/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/mapper/room/RoomWeekDiamondRewardRecordAdminMapper.java index bfb0a3410..9e86d3f6f 100644 --- a/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/mapper/room/RoomWeekDiamondRewardRecordAdminMapper.java +++ b/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/mapper/room/RoomWeekDiamondRewardRecordAdminMapper.java @@ -15,6 +15,6 @@ import org.apache.ibatis.annotations.Param; public interface RoomWeekDiamondRewardRecordAdminMapper extends BaseMapper { IPage pageRecord(IPage iPage, @Param("partitionId") Integer partitionId, @Param("regionId") Integer regionId, - @Param("roomUid") Long roomUid, @Param("startDate") String startDate, @Param("endDate") String endDate, + @Param("roomUid") Long roomUid, @Param("dateCycle") String dateCycle, @Param("status") Integer status, @Param("notEqualsTodate") String notEqualsTodate, @Param("guildId") Integer guildId); } \ No newline at end of file diff --git a/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/room/RoomWeekDiamondRewardRecordAdminService.java b/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/room/RoomWeekDiamondRewardRecordAdminService.java index 35aebd1cc..6c3aedf91 100644 --- a/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/room/RoomWeekDiamondRewardRecordAdminService.java +++ b/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/room/RoomWeekDiamondRewardRecordAdminService.java @@ -7,7 +7,6 @@ import com.accompany.business.model.room.RoomWeekDiamondNum; import com.accompany.business.model.room.RoomWeekDiamondReward; import com.accompany.business.model.room.RoomWeekDiamondRewardRecord; import com.accompany.admin.mapper.room.RoomWeekDiamondRewardRecordAdminMapper; -import com.accompany.business.service.BaseSendService; import com.accompany.business.service.SendSysMsgService; import com.accompany.business.service.guild.GuildService; import com.accompany.business.service.purse.UserPurseService; @@ -15,7 +14,6 @@ import com.accompany.business.service.record.BillRecordService; import com.accompany.business.service.room.RoomWeekDiamondNumService; import com.accompany.business.service.room.RoomWeekDiamondRewardService; import com.accompany.business.service.user.UsersService; -import com.accompany.common.result.BusiResult; import com.accompany.common.result.PageResult; import com.accompany.common.status.BusiStatus; import com.accompany.common.utils.DateTimeUtil; @@ -71,13 +69,8 @@ public class RoomWeekDiamondRewardRecordAdminService extends ServiceImpl listLevel() { - return roomWeekDiamondRewardService.lambdaQuery().orderByAsc(RoomWeekDiamondReward::getDiamondNum).list() - .stream().map(RoomWeekDiamondReward::getLevelName).toList(); - } - public PageResult pageRecord(Integer partitionId, Integer regionId, Long erbanNo, Long ownerErbanNo, Integer guildId, - String startDate, String endDate, Integer status, Integer pageNo, Integer pageSize) { + String dateCycle, Integer status, Integer pageNo, Integer pageSize) { if (partitionId == null) { throw new AdminServiceException("分区不能为空"); } @@ -115,7 +108,7 @@ public class RoomWeekDiamondRewardRecordAdminService extends ServiceImpl iPage = new Page<>(pageNo, pageSize); - baseMapper.pageRecord(iPage, partitionId, regionId, roomUid, startDate, endDate, status, notEqualsToWeek, guildId); + baseMapper.pageRecord(iPage, partitionId, regionId, roomUid, dateCycle, status, notEqualsToWeek, guildId); PageResult pageResult = new PageResult<>(iPage); List rows = pageResult.getRows(); diff --git a/accompany-admin/accompany-admin-service/src/main/resources/accompany/sqlmappers/RoomWeekDiamondRewardRecordAdminMapper.xml b/accompany-admin/accompany-admin-service/src/main/resources/accompany/sqlmappers/RoomWeekDiamondRewardRecordAdminMapper.xml index 67dcecf2f..cb3e7969f 100644 --- a/accompany-admin/accompany-admin-service/src/main/resources/accompany/sqlmappers/RoomWeekDiamondRewardRecordAdminMapper.xml +++ b/accompany-admin/accompany-admin-service/src/main/resources/accompany/sqlmappers/RoomWeekDiamondRewardRecordAdminMapper.xml @@ -45,11 +45,8 @@ and rn.room_uid = #{roomUid} - - and rn.stat_date >= #{startDate} - - - and rn.stat_date <= #{endDate} + + and rn.stat_date = #{dateCycle} diff --git a/accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/room/RoomWeekDiamondRewardAdminController.java b/accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/room/RoomWeekDiamondRewardAdminController.java index 712fa19c8..38b51ff8b 100644 --- a/accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/room/RoomWeekDiamondRewardAdminController.java +++ b/accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/room/RoomWeekDiamondRewardAdminController.java @@ -6,6 +6,7 @@ import com.accompany.business.param.BasePageParams; import com.accompany.admin.vo.room.RoomWeekDiamondRewardRecordAdminVo; import com.accompany.common.result.BusiResult; import com.accompany.common.result.PageResult; +import com.accompany.core.exception.AdminServiceException; import com.alibaba.excel.EasyExcel; import com.alibaba.excel.support.ExcelTypeEnum; import io.swagger.annotations.Api; @@ -22,7 +23,6 @@ import javax.servlet.http.HttpServletResponse; import java.io.IOException; import java.net.URLEncoder; import java.nio.charset.StandardCharsets; -import java.util.List; @RestController @RequestMapping("/admin/roomWeekDiamond") @@ -32,13 +32,6 @@ public class RoomWeekDiamondRewardAdminController extends BaseController { @Autowired private RoomWeekDiamondRewardRecordAdminService roomWeekDiamondRewardRecordAdminService; - @ApiOperation(value = "档位列表", httpMethod = "GET") - @GetMapping("/listLevel") - public BusiResult> listLevel() { - List levelList = roomWeekDiamondRewardRecordAdminService.listLevel(); - return BusiResult.success(levelList); - } - @ApiOperation(value = "每周钻石流水列表", httpMethod = "GET") @ApiImplicitParams({ @ApiImplicitParam(name = "partitionId", value = "分区id", required = true, dataType = "int"), @@ -46,30 +39,33 @@ public class RoomWeekDiamondRewardAdminController extends BaseController { @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 = "int"), @ApiImplicitParam(name = "status", value = "发放状态：-1:全部,0:未发放，1已经发放", required = false, dataType = "long"), }) @GetMapping("/page") - public BusiResult> page(Long erbanNo, Long ownerErbanNo, Integer guildId, Integer status, BasePageParams pageParams) { + public BusiResult> page(Long erbanNo, Long ownerErbanNo, Integer guildId, String dateCycle, Integer status, BasePageParams pageParams) { - PageResult pageResult = roomWeekDiamondRewardRecordAdminService.pageRecord(pageParams.getPartitionId(), pageParams.getRegionId(), erbanNo, ownerErbanNo, guildId, pageParams.getStartTime(), - pageParams.getEndTime(), status, pageParams.getPageNo(), pageParams.getPageSize()); + PageResult pageResult = roomWeekDiamondRewardRecordAdminService.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 = "erbanNo", value = "用户id", required = false, dataType = "long"), - @ApiImplicitParam(name = "ownerErbanNo", value = "ownerErbanNo", required = false, dataType = "long"), - @ApiImplicitParam(name = "guildId", value = "用户id", required = false, dataType = "int"), + @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 = "int"), @ApiImplicitParam(name = "status", value = "发放状态：-1:全部,0:未发放，1已经发放", required = false, dataType = "long"), }) @GetMapping("/export") - public void export(HttpServletResponse response, Integer regionId, Long erbanNo, Long ownerErbanNo, Integer guildId, Integer status, BasePageParams pageParams) throws IOException { + public void export(HttpServletResponse response, Integer regionId, Long erbanNo, Long ownerErbanNo, Integer guildId, String dateCycle, Integer status, BasePageParams pageParams) throws IOException { pageParams.setPageNo(0); pageParams.setPageSize(-1); - PageResult pageResult = roomWeekDiamondRewardRecordAdminService.pageRecord(pageParams.getPartitionId(), regionId, erbanNo, ownerErbanNo, guildId, pageParams.getStartTime(), - pageParams.getEndTime(), status, pageParams.getPageNo(), pageParams.getPageSize()); + PageResult pageResult = roomWeekDiamondRewardRecordAdminService.pageRecord(pageParams.getPartitionId(), regionId, erbanNo, ownerErbanNo, guildId, dateCycle, + status, pageParams.getPageNo(), pageParams.getPageSize()); response.setContentType("application/vnd.ms-excel"); response.setCharacterEncoding("utf-8"); // 这里URLEncoder.encode可以防止中文乱码