周/月 任务抽奖 改为 单次
This commit is contained in:
@@ -149,13 +149,20 @@ public class DiscSpinningController {
|
||||
int drawCount = Integer.parseInt(commonRepository.findOne(901).getValue());
|
||||
map.put("sum", drawCount);
|
||||
if (source != null && !source.equals(1)) {
|
||||
Integer spinningCount = recordService.countSourceRecord(userId, "taskW");
|
||||
String sourceType = null;
|
||||
if (source == 2) {
|
||||
sourceType = "taskW";
|
||||
} else {
|
||||
sourceType = "taskM";
|
||||
}
|
||||
Integer spinningCount = recordService.countSourceRecord(null, userId, sourceType);
|
||||
if (spinningCount != null && spinningCount > 0) {
|
||||
map.put("count", 0);
|
||||
} else {
|
||||
int i = taskCenterService.countTaskDisc(userId, source.toString());
|
||||
map.put("count", i > 0 ? 1 : 0);
|
||||
}
|
||||
|
||||
} else {
|
||||
//订单可抽奖次数
|
||||
int i = recordService.countDraw(userId);
|
||||
@@ -212,7 +219,7 @@ public class DiscSpinningController {
|
||||
} else {
|
||||
String redisKey = "";
|
||||
if (source.equals(2)) {
|
||||
Integer spinningCount = recordService.countSourceRecord(userId, "taskW");
|
||||
Integer spinningCount = recordService.countSourceRecord(null, userId, "taskW");
|
||||
if (spinningCount != null && spinningCount > 0) {
|
||||
return Result.error("周抽奖用户仅可参加一次");
|
||||
}
|
||||
|
||||
@@ -9,6 +9,6 @@ public interface DiscSpinningRecordService extends IService<DiscSpinningRecord>
|
||||
|
||||
Integer countDraw(Long userId);
|
||||
//当月的 月记录 已抽 抽奖次数
|
||||
Integer countSourceRecord(Long sourceId,String source);
|
||||
Integer countSourceRecord(Long sourceId,Long userId,String source);
|
||||
}
|
||||
|
||||
|
||||
@@ -26,11 +26,14 @@ public class DiscSpinningRecordServiceImpl extends ServiceImpl<DiscSpinningRecor
|
||||
}
|
||||
|
||||
@Override
|
||||
public Integer countSourceRecord(Long sourceId,String source) {
|
||||
public Integer countSourceRecord(Long sourceId, Long userId, String source) {
|
||||
QueryWrapper<DiscSpinningRecord> recordQuery = new QueryWrapper<>();
|
||||
recordQuery.eq("source_id", sourceId);
|
||||
if (userId != null) {
|
||||
recordQuery.eq("source_id", sourceId);
|
||||
}
|
||||
recordQuery.eq("user_id", userId);
|
||||
recordQuery.eq("source", source);
|
||||
recordQuery.gt("create_time", DateUtil.beginOfMonth(new Date()));
|
||||
// recordQuery.gt("create_time", DateUtil.beginOfMonth(new Date()));
|
||||
return discSpinningRecordDao.selectCount(recordQuery);
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user