parent
07148d4224
commit
944f841aaa
|
|
@ -129,9 +129,14 @@ public class DiscSpinningController {
|
|||
@ApiOperation("查询大转盘")
|
||||
public Result selectDiscSpinning(@RequestParam(required = false, defaultValue = "1") Integer source) {
|
||||
PageHelper.startPage(1, 20);
|
||||
return Result.success().put("data", PageUtils.page(new PageInfo<>(discSpinningService.list(
|
||||
new QueryWrapper<DiscSpinning>().eq("disc_type", source).orderByAsc("disc_type", "odds"))), true)
|
||||
);
|
||||
List<DiscSpinning> list = discSpinningService.list(
|
||||
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;
|
||||
}
|
||||
}
|
||||
if (recordService.countTaskNum(userId, s.getId(), null) > 0) {
|
||||
continue;
|
||||
}
|
||||
Integer sumOrderNum = 0;
|
||||
if (inviteAchievement != null) {
|
||||
sumOrderNum = inviteAchievement.getCount();
|
||||
|
|
@ -206,9 +209,6 @@ public class TaskCenterServiceImpl extends ServiceImpl<TaskCenterDao, TaskCenter
|
|||
if (sumOrderNum != null && sumOrderNum < s.getNumber()) {
|
||||
s.setDiscNumber(sumOrderNum);
|
||||
s.setNumber(s.getNumber());
|
||||
}
|
||||
if (recordService.countTaskNum(userId, s.getId(), null) > 0) {
|
||||
continue;
|
||||
} else {
|
||||
s.setDiscNumber(null);
|
||||
s.setNumber(null);
|
||||
|
|
|
|||
Loading…
Reference in New Issue