czg_team
/
video_server
7
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/test' into test

This commit is contained in:
张松 2025-01-16 14:50:49 +08:00
parent 10e48d887e 46cd04358c
commit ecf6dc2021
2 changed files with 26 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/main/java/com/sqx/modules/discSpinning/controller/DiscSpinningController.java
View File

@ -1,5 +1,6 @@
package com.sqx.modules.discSpinning.controller;
import cn.hutool.core.collection.CollectionUtil;
import cn.hutool.core.date.DateUtil;
import cn.hutool.core.util.StrUtil;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
@ -230,9 +231,16 @@ public class DiscSpinningController {
}
redisKey = RedisKeys.getDateKey("spinning:draw:taskW") + userId;
} else if (source.equals(3)) {
Integer spinningCount = recordService.countSourceRecord(null, userId, "taskM");
if (spinningCount != null && spinningCount > 0) {
return Result.error("月抽奖用户仅可参加一次");
}
redisKey = RedisKeys.getDateKey("spinning:draw:taskM") + userId;
}
Map<String, Object> week = redisUtils.get(redisKey, Map.class);
if (CollectionUtil.isEmpty(week)) {
return Result.error("请求失败，请联系管理员");
}
for (Map.Entry<String, Object> entry : week.entrySet()) {
int value = new BigDecimal(entry.getValue().toString()).intValue();
if (value > 1) {

29
src/main/java/com/sqx/modules/taskCenter/service/impl/TaskCenterServiceImpl.java
View File

@ -100,10 +100,11 @@ public class TaskCenterServiceImpl extends ServiceImpl<TaskCenterDao, TaskCenter
if (rewardMap.containsKey(9)) {
Integer spinningCount = discSpinningRecordService.countSourceRecord(null, userId, "taskW");
if (spinningCount != null && spinningCount > 0) {
s.setButtonTitle("已领取");
s.setDisabled(false);
s.setNumber(null);
break;
// s.setButtonTitle("已领取");
// s.setDisabled(false);
// s.setNumber(null);
// break;
continue;
}
boolean isBreak = false;
//抽奖次数
@ -127,9 +128,10 @@ public class TaskCenterServiceImpl extends ServiceImpl<TaskCenterDao, TaskCenter
s.setDiscNumber(wSignCount == null ? 0 : wSignCount);
s.setDisabled(false);
} else {
s.setButtonTitle("已领取");
s.setDisabled(false);
s.setNumber(null);
// s.setButtonTitle("已领取");
// s.setDisabled(false);
// s.setNumber(null);
continue;
}
}
//月任务
@ -148,10 +150,11 @@ public class TaskCenterServiceImpl extends ServiceImpl<TaskCenterDao, TaskCenter
s.setNumber(null);
break;
} else {
s.setButtonTitle("已领取");
s.setDisabled(false);
s.setDiscNumber(null);
s.setNumber(null);
// s.setButtonTitle("已领取");
// s.setDisabled(false);
// s.setDiscNumber(null);
// s.setNumber(null);
continue;
}
} else {
if (recordService.countTaskNum(userId, s.getId(), DateUtil.beginOfMonth(new Date()) + " 00:00:00") > 0) {
@ -251,6 +254,8 @@ public class TaskCenterServiceImpl extends ServiceImpl<TaskCenterDao, TaskCenter
return Result.error("不可重复领取");
}
signRecordService.save(signRecord);
}else {
return Result.error("异常领取，已记录");
}
} else if (taskCenter.getType().equals(3) && taskCenter.getId().equals(1L)) {
Integer sumOrderNum = 0;
@ -278,6 +283,8 @@ public class TaskCenterServiceImpl extends ServiceImpl<TaskCenterDao, TaskCenter
if (recordService.countTaskNum(courseIds, taskCenter.getId(), null) > 0)
return Result.error("同一实名算一个新用户，不可重复领取");
}
}else {
return Result.error("异常领取，已记录");
}
List<TaskCenterRecord> records = new ArrayList<>();
Long targetId = null;