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

Merge branch 'dev' into test 

# Conflicts:
#	src/main/java/com/sqx/modules/taskCenter/controller/TaskCenterController.java
This commit is contained in:
wangw 2025-01-07 19:12:27 +08:00
parent 5dcc299ee1 411337bbd5
commit cafa150d02
2 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/main/java/com/sqx/modules/taskCenter/controller/TaskCenterController.java
View File

@ -105,12 +105,12 @@ public class TaskCenterController {
@ApiImplicitParam(name = "id", value = "任务id", dataTypeClass = Long.class),
})
@ApiOperation("App 任务中心 领取")
@Debounce(interval = 1000, value = "#userId")
@Debounce(value = "#userId,#id")
public Result taskReceive(@ApiIgnore @RequestAttribute("userId") Long userId, Long id) {
if (id != null && id == 19) {
log.info("异常用户id: {}", userId);
UserInfo userInfo = userInfoMapper.selectOne(new LambdaQueryWrapper<UserInfo>().eq(UserInfo::getUserId, userId));
log.info("异常领取任务用户: {}", userInfo.getUserId() + userInfo.getCertName());
if (!StrUtil.isBlank(userInfo.getCertNo())) {
if (userInfo != null && !StrUtil.isBlank(userInfo.getCertNo())) {
TbUserBlacklist userBlacklist = new TbUserBlacklist();
userBlacklist.setRealName(userInfo.getCertName());
userBlacklist.setIdCardNo(userInfo.getCertNo());
@ -127,7 +127,7 @@ public class TaskCenterController {
@ApiImplicitParam(name = "taskId", value = "任务id", dataTypeClass = Long.class, paramType = "body"),
@ApiImplicitParam(name = "sourceId", value = "实物(物品Id)", dataTypeClass = Long.class, paramType = "body")
})
@Debounce(interval = 1000, value = "#userId")
@Debounce(interval = 600000, value = "#userId,#record.taskId")
public Result receiveGoods(@ApiIgnore @RequestAttribute("userId") Long userId,@ApiIgnore TaskCenterRecord record) {
TaskCenter task = taskCenterService.getById(record.getTaskId());
if (Objects.isNull(task)) {

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

@ -200,7 +200,9 @@ public class TaskCenterServiceImpl extends ServiceImpl<TaskCenterDao, TaskCenter
@Transactional
public Result taskReceive(Long userId, Long id) {
TaskCenter taskCenter = baseMapper.selectById(id);
if (!taskCenter.getShows().equals(1)) {
return Result.error("领取失败");
}
if (taskCenter.getType().equals(2)) {
Integer dayOrderNum = ordersService.countOrderNum(userId, DateUtil.today() + " 00:00:00");
if (taskCenter.getNumber().equals(1)) {