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:
Tankaikai 2025-01-14 18:26:31 +08:00
parent 9ed2da9894 ddf062c3cb
commit cc760ba52b
4 changed files with 28 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -149,13 +149,20 @@ public class DiscSpinningController {
int drawCount = Integer.parseInt(commonRepository.findOne(901).getValue()); int drawCount = Integer.parseInt(commonRepository.findOne(901).getValue());
map.put("sum", drawCount); map.put("sum", drawCount);
if (source != null && !source.equals(1)) { if (source != null && !source.equals(1)) {
Integer spinningCount = recordService.countSourceRecord(userId, "taskW"); String sourceType = null;
if (source.equals(2)) {
sourceType = "taskW";
} else {
sourceType = "taskM";
}
Integer spinningCount = recordService.countSourceRecord(null, userId, sourceType);
if (spinningCount != null && spinningCount > 0) { if (spinningCount != null && spinningCount > 0) {
map.put("count", 0); map.put("count", 0);
} else { } else {
int i = taskCenterService.countTaskDisc(userId, source.toString()); int i = taskCenterService.countTaskDisc(userId, source.toString());
map.put("count", i > 0 ? 1 : 0); map.put("count", i > 0 ? 1 : 0);
} }
} else { } else {
//订单可抽奖次数 //订单可抽奖次数
int i = recordService.countDraw(userId); int i = recordService.countDraw(userId);
@ -212,7 +219,7 @@ public class DiscSpinningController {
} else { } else {
String redisKey = ""; String redisKey = "";
if (source.equals(2)) { if (source.equals(2)) {
Integer spinningCount = recordService.countSourceRecord(userId, "taskW"); Integer spinningCount = recordService.countSourceRecord(null, userId, "taskW");
if (spinningCount != null && spinningCount > 0) { if (spinningCount != null && spinningCount > 0) {
return Result.error("周抽奖用户仅可参加一次"); return Result.error("周抽奖用户仅可参加一次");
} }

4
src/main/java/com/sqx/modules/discSpinning/service/DiscSpinningRecordService.java
View File

@ -8,7 +8,7 @@ import java.util.Map;
public interface DiscSpinningRecordService extends IService<DiscSpinningRecord> { public interface DiscSpinningRecordService extends IService<DiscSpinningRecord> {
Integer countDraw(Long userId); Integer countDraw(Long userId);
//当月的 月记录 已抽 抽奖次数 //记录 已抽 抽奖次数
Integer countSourceRecord(Long sourceId,String source); Integer countSourceRecord(Long sourceId,Long userId,String source);
} }

9
src/main/java/com/sqx/modules/discSpinning/service/impl/DiscSpinningRecordServiceImpl.java
View File

@ -26,11 +26,14 @@ public class DiscSpinningRecordServiceImpl extends ServiceImpl<DiscSpinningRecor
} }
@Override @Override
public Integer countSourceRecord(Long sourceId,String source) { public Integer countSourceRecord(Long sourceId, Long userId, String source) {
QueryWrapper<DiscSpinningRecord> recordQuery = new QueryWrapper<>(); QueryWrapper<DiscSpinningRecord> recordQuery = new QueryWrapper<>();
recordQuery.eq("source_id", sourceId); if (sourceId != null) {
recordQuery.eq("source_id", sourceId);
}
recordQuery.eq("user_id", userId);
recordQuery.eq("source", source); recordQuery.eq("source", source);
recordQuery.gt("create_time", DateUtil.beginOfMonth(new Date())); // recordQuery.gt("create_time", DateUtil.beginOfMonth(new Date()));
return discSpinningRecordDao.selectCount(recordQuery); return discSpinningRecordDao.selectCount(recordQuery);
} }
} }

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

@ -98,7 +98,7 @@ public class TaskCenterServiceImpl extends ServiceImpl<TaskCenterDao, TaskCenter
//周任务 //周任务
if (s.getNumber() > 1 && s.getNumber() < 8) { if (s.getNumber() > 1 && s.getNumber() < 8) {
if (rewardMap.containsKey(9)) { if (rewardMap.containsKey(9)) {
Integer spinningCount = discSpinningRecordService.countSourceRecord(s.getId(), "taskW"); Integer spinningCount = discSpinningRecordService.countSourceRecord(null, userId, "taskW");
if (spinningCount != null && spinningCount > 0) { if (spinningCount != null && spinningCount > 0) {
s.setButtonTitle("已领取"); s.setButtonTitle("已领取");
s.setDisabled(false); s.setDisabled(false);
@ -142,7 +142,7 @@ public class TaskCenterServiceImpl extends ServiceImpl<TaskCenterDao, TaskCenter
s.setDisabled(false); s.setDisabled(false);
} else { } else {
if (rewardMap.containsKey(9)) { if (rewardMap.containsKey(9)) {
Integer spinningCount = discSpinningRecordService.countSourceRecord(s.getId(), "taskM"); Integer spinningCount = discSpinningRecordService.countSourceRecord(s.getId(), userId, "taskM");
if (spinningCount == null || rewardMap.get(9) - spinningCount > 0) { if (spinningCount == null || rewardMap.get(9) - spinningCount > 0) {
s.setDiscNumber(null); s.setDiscNumber(null);
s.setNumber(null); s.setNumber(null);
@ -337,12 +337,19 @@ public class TaskCenterServiceImpl extends ServiceImpl<TaskCenterDao, TaskCenter
} }
QueryWrapper<TaskCenter> queryWrapper = new QueryWrapper<>(); QueryWrapper<TaskCenter> queryWrapper = new QueryWrapper<>();
queryWrapper.eq("type", 2); queryWrapper.eq("type", 2);
String sourceType = null;
if ("2".equals(type)) { if ("2".equals(type)) {
queryWrapper.gt("number", 1); queryWrapper.gt("number", 1);
queryWrapper.lt("number", 8); queryWrapper.lt("number", 8);
sourceType = "taskW";
} else if ("3".equals(type)) { } else if ("3".equals(type)) {
queryWrapper.gt("number", 7); queryWrapper.gt("number", 7);
queryWrapper.lt("number", 32); queryWrapper.lt("number", 32);
sourceType = "taskM";
}
Integer spCount = discSpinningRecordService.countSourceRecord(null, userId, sourceType);
if (spCount != null && spCount > 0) {
return 0;
} }
List<TaskCenter> taskCenters = baseMapper.selectList(queryWrapper); List<TaskCenter> taskCenters = baseMapper.selectList(queryWrapper);
for (TaskCenter taskCenter : taskCenters) { for (TaskCenter taskCenter : taskCenters) {
@ -352,10 +359,6 @@ public class TaskCenterServiceImpl extends ServiceImpl<TaskCenterDao, TaskCenter
} }
Map<Long, Integer> taskWRedisMap = new HashMap<>(); Map<Long, Integer> taskWRedisMap = new HashMap<>();
if ("2".equals(type)) { if ("2".equals(type)) {
Integer spinningCount = discSpinningRecordService.countSourceRecord(userId, "taskW");
if (spinningCount != null && spinningCount > 0) {
return 0;
}
//抽奖次数 //抽奖次数
Map<Long, Integer> taskWCount = signRecordService.getTaskWCount(userId, rewardMap.get(9)); Map<Long, Integer> taskWCount = signRecordService.getTaskWCount(userId, rewardMap.get(9));
if (CollectionUtil.isNotEmpty(taskWCount)) { if (CollectionUtil.isNotEmpty(taskWCount)) {
@ -377,8 +380,8 @@ public class TaskCenterServiceImpl extends ServiceImpl<TaskCenterDao, TaskCenter
} }
if (signCount >= taskCenter.getNumber()) { if (signCount >= taskCenter.getNumber()) {
if (rewardMap.containsKey(9)) { if (rewardMap.containsKey(9)) {
Integer spinningCount = discSpinningRecordService.countSourceRecord(taskCenter.getId(), "taskM"); Integer spinningCount = discSpinningRecordService.countSourceRecord(taskCenter.getId(), userId, "taskM");
countTaskDisc = rewardMap.get(9) + (spinningCount == null ? 0 : spinningCount); countTaskDisc = rewardMap.get(9) - (spinningCount == null ? 0 : spinningCount);
if (countTaskDisc > 0) { if (countTaskDisc > 0) {
taskWRedisMap.put(taskCenter.getId(), countTaskDisc); taskWRedisMap.put(taskCenter.getId(), countTaskDisc);
} }