moliparty/peko-java
4
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

房间周流水-后台-参数-周期

Browse Source
This commit is contained in:
khalil
2025-08-28 18:53:51 +08:00
parent 1b7196a160
commit b5c3572bc9
4 changed files with 17 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/mapper/room/RoomWeekDiamondRewardRecordAdminMapper.java
View File

@@ -15,6 +15,6 @@ import org.apache.ibatis.annotations.Param;
public interface RoomWeekDiamondRewardRecordAdminMapper extends BaseMapper<RoomWeekDiamondRewardRecord> {
IPage<RoomWeekDiamondRewardRecordAdminVo> pageRecord(IPage<RoomWeekDiamondRewardRecordAdminVo> 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);
}

11
accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/room/RoomWeekDiamondRewardRecordAdminService.java
View File

@@ -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<RoomWee
@Autowired
private SendSysMsgService sendSysMsgService;
public List<String> listLevel() {
return roomWeekDiamondRewardService.lambdaQuery().orderByAsc(RoomWeekDiamondReward::getDiamondNum).list()
.stream().map(RoomWeekDiamondReward::getLevelName).toList();
}
public PageResult<RoomWeekDiamondRewardRecordAdminVo> 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<RoomWee
}
IPage<RoomWeekDiamondRewardRecordAdminVo> 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<RoomWeekDiamondRewardRecordAdminVo> pageResult = new PageResult<>(iPage);
List<RoomWeekDiamondRewardRecordAdminVo> rows = pageResult.getRows();

7
accompany-admin/accompany-admin-service/src/main/resources/accompany/sqlmappers/RoomWeekDiamondRewardRecordAdminMapper.xml
View File

@@ -45,11 +45,8 @@
<if test="roomUid != null">
and rn.room_uid = #{roomUid}
</if>
<if test="startDate != null and startDate != ''">
and rn.stat_date &gt;= #{startDate}
</if>
<if test="endDate != null and endDate != ''">
and rn.stat_date &lt;= #{endDate}
<if test="dateCycle != null and dateCycle != ''">
and rn.stat_date = #{dateCycle}
</if>
<choose>
<when test="status != null and status == 0">

28
accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/room/RoomWeekDiamondRewardAdminController.java
View File

@@ -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<List<String>> listLevel() {
List<String> 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<PageResult<RoomWeekDiamondRewardRecordAdminVo>> page(Long erbanNo, Long ownerErbanNo, Integer guildId, Integer status, BasePageParams pageParams) {
public BusiResult<PageResult<RoomWeekDiamondRewardRecordAdminVo>> page(Long erbanNo, Long ownerErbanNo, Integer guildId, String dateCycle, Integer status, BasePageParams pageParams) {
PageResult<RoomWeekDiamondRewardRecordAdminVo> pageResult = roomWeekDiamondRewardRecordAdminService.pageRecord(pageParams.getPartitionId(), pageParams.getRegionId(), erbanNo, ownerErbanNo, guildId, pageParams.getStartTime(),
pageParams.getEndTime(), status, pageParams.getPageNo(), pageParams.getPageSize());
PageResult<RoomWeekDiamondRewardRecordAdminVo> 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<RoomWeekDiamondRewardRecordAdminVo> pageResult = roomWeekDiamondRewardRecordAdminService.pageRecord(pageParams.getPartitionId(), regionId, erbanNo, ownerErbanNo, guildId, pageParams.getStartTime(),
pageParams.getEndTime(), status, pageParams.getPageNo(), pageParams.getPageSize());
PageResult<RoomWeekDiamondRewardRecordAdminVo> 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可以防止中文乱码