抽奖转盘 不返回概率
抽奖转盘 任务中心 单次任务问题
This commit is contained in:
@@ -129,9 +129,14 @@ public class DiscSpinningController {
|
|||||||
@ApiOperation("查询大转盘")
|
@ApiOperation("查询大转盘")
|
||||||
public Result selectDiscSpinning(@RequestParam(required = false, defaultValue = "1") Integer source) {
|
public Result selectDiscSpinning(@RequestParam(required = false, defaultValue = "1") Integer source) {
|
||||||
PageHelper.startPage(1, 20);
|
PageHelper.startPage(1, 20);
|
||||||
return Result.success().put("data", PageUtils.page(new PageInfo<>(discSpinningService.list(
|
List<DiscSpinning> list = discSpinningService.list(
|
||||||
new QueryWrapper<DiscSpinning>().eq("disc_type", source).orderByAsc("disc_type", "odds"))), true)
|
new QueryWrapper<DiscSpinning>().eq("disc_type", source).orderByAsc("disc_type", "odds"));
|
||||||
);
|
for (DiscSpinning discSpinning : list) {
|
||||||
|
discSpinning.setOdds(null);
|
||||||
|
discSpinning.setNumber(null);
|
||||||
|
discSpinning.setDiscType(null);
|
||||||
|
}
|
||||||
|
return Result.success().put("data", PageUtils.page(new PageInfo<>(list), true));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
@@ -199,6 +199,9 @@ public class TaskCenterServiceImpl extends ServiceImpl<TaskCenterDao, TaskCenter
|
|||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
if (recordService.countTaskNum(userId, s.getId(), null) > 0) {
|
||||||
|
continue;
|
||||||
|
}
|
||||||
Integer sumOrderNum = 0;
|
Integer sumOrderNum = 0;
|
||||||
if (inviteAchievement != null) {
|
if (inviteAchievement != null) {
|
||||||
sumOrderNum = inviteAchievement.getCount();
|
sumOrderNum = inviteAchievement.getCount();
|
||||||
@@ -206,9 +209,6 @@ public class TaskCenterServiceImpl extends ServiceImpl<TaskCenterDao, TaskCenter
|
|||||||
if (sumOrderNum != null && sumOrderNum < s.getNumber()) {
|
if (sumOrderNum != null && sumOrderNum < s.getNumber()) {
|
||||||
s.setDiscNumber(sumOrderNum);
|
s.setDiscNumber(sumOrderNum);
|
||||||
s.setNumber(s.getNumber());
|
s.setNumber(s.getNumber());
|
||||||
}
|
|
||||||
if (recordService.countTaskNum(userId, s.getId(), null) > 0) {
|
|
||||||
continue;
|
|
||||||
} else {
|
} else {
|
||||||
s.setDiscNumber(null);
|
s.setDiscNumber(null);
|
||||||
s.setNumber(null);
|
s.setNumber(null);
|
||||||
|
|||||||
Reference in New Issue
Block a user