From beb2648726b79268968f3d4e319eeb70490268ba Mon Sep 17 00:00:00 2001 From: wangw <1594593906@qq.com> Date: Fri, 10 Jan 2025 15:42:53 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E4=BC=98=E5=8C=96=E4=BB=BB=E5=8A=A1?= =?UTF-8?q?=E4=B8=AD=E5=BF=83?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modules/app/entity/InviteAchievement.java | 4 ++ .../service/impl/TaskCenterServiceImpl.java | 41 ++++++++++++++++--- 2 files changed, 39 insertions(+), 6 deletions(-) diff --git a/src/main/java/com/sqx/modules/app/entity/InviteAchievement.java b/src/main/java/com/sqx/modules/app/entity/InviteAchievement.java index 672f3d5f..59f0ee6c 100644 --- a/src/main/java/com/sqx/modules/app/entity/InviteAchievement.java +++ b/src/main/java/com/sqx/modules/app/entity/InviteAchievement.java @@ -50,6 +50,10 @@ public class InviteAchievement implements Serializable { * 是否首次达标 */ private Integer state; + /** + * 一次性任务领取记录 默认为空 存储为 taskId,taskId + */ + private String tasks; /** * 创建时间 diff --git a/src/main/java/com/sqx/modules/taskCenter/service/impl/TaskCenterServiceImpl.java b/src/main/java/com/sqx/modules/taskCenter/service/impl/TaskCenterServiceImpl.java index 72417894..218c85e2 100644 --- a/src/main/java/com/sqx/modules/taskCenter/service/impl/TaskCenterServiceImpl.java +++ b/src/main/java/com/sqx/modules/taskCenter/service/impl/TaskCenterServiceImpl.java @@ -2,7 +2,9 @@ package com.sqx.modules.taskCenter.service.impl; import cn.hutool.core.collection.CollectionUtil; import cn.hutool.core.date.DateUtil; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.sqx.common.utils.DateUtils; import com.sqx.common.utils.RedisKeys; @@ -168,23 +170,35 @@ public class TaskCenterServiceImpl extends ServiceImpl users = userInfoService.getUsersByNameAndCertNo(userInfo.getCertName(), userInfo.getCertNo()); Set courseIds = users.stream().map(UserInfo::getUserId).collect(Collectors.toSet()); - if (recordService.countTaskNum(courseIds, s.getId(), null) > 0){ + if (recordService.countTaskNum(courseIds, s.getId(), null) > 0) { continue; } - }else if (recordService.countTaskNum(userId, s.getId(), null) > 0){ + } else if (recordService.countTaskNum(userId, s.getId(), null) > 0) { s.setDiscNumber(0); s.setNumber(null); s.setJumpType(0); @@ -205,6 +219,7 @@ public class TaskCenterServiceImpl extends ServiceImpl users = userInfoService.getUsersByNameAndCertNo(userInfo.getCertName(), userInfo.getCertNo()); Set courseIds = users.stream().map(UserInfo::getUserId).collect(Collectors.toSet()); - if (recordService.countTaskNum(courseIds, taskCenter.getId(), null) > 0) return Result.error("同一实名算一个新用户，不可重复领取"); + if (recordService.countTaskNum(courseIds, taskCenter.getId(), null) > 0) + return Result.error("同一实名算一个新用户，不可重复领取"); } } List records = new ArrayList<>(); @@ -286,6 +309,12 @@ public class TaskCenterServiceImpl extends ServiceImpl() + .eq(InviteAchievement::getUserId, inviteAchievement.getUserId()) + .eq(InviteAchievement::getId, inviteAchievement.getId()) + .set(InviteAchievement::getTasks, StringUtils.isBlank(inviteAchievement.getTasks()) ? "1" : inviteAchievement.getTasks() + ",1")); + } return Result.success(); } From 3fde641ce307e1090a409bc051db9bf88dbbe040 Mon Sep 17 00:00:00 2001 From: wangw <1594593906@qq.com> Date: Fri, 10 Jan 2025 16:00:45 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E6=97=A0=E9=82=80=E8=AF=B7=E4=BA=BA?= =?UTF-8?q?=E6=97=B6=20return?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/com/sqx/modules/job/task/TempOrdersTask.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/main/java/com/sqx/modules/job/task/TempOrdersTask.java b/src/main/java/com/sqx/modules/job/task/TempOrdersTask.java index cc64b472..6b655897 100644 --- a/src/main/java/com/sqx/modules/job/task/TempOrdersTask.java +++ b/src/main/java/com/sqx/modules/job/task/TempOrdersTask.java @@ -263,6 +263,8 @@ public class TempOrdersTask { if (!byUserIdList.isEmpty()) { count = userInfoService.list(new LambdaQueryWrapper().in(UserInfo::getUserId, byUserIdList).isNotNull(UserInfo::getAccountNo).select(UserInfo::getCertNo)) .stream().map(UserInfo::getCertNo).collect(Collectors.toSet()).size(); + }else { + return; } logger.info("邀请达标人员: {}", count); //count 邀请的已达标人数 From 399c68db867dd7460b37a7215243c0c567db8b98 Mon Sep 17 00:00:00 2001 From: wangw <1594593906@qq.com> Date: Fri, 10 Jan 2025 16:05:39 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E4=BB=BB=E5=8A=A1=E4=B8=AD=E5=BF=83=20?= =?UTF-8?q?=E5=B1=95=E7=A4=BA=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/TaskCenterServiceImpl.java | 32 +++++++++++-------- 1 file changed, 19 insertions(+), 13 deletions(-) diff --git a/src/main/java/com/sqx/modules/taskCenter/service/impl/TaskCenterServiceImpl.java b/src/main/java/com/sqx/modules/taskCenter/service/impl/TaskCenterServiceImpl.java index 218c85e2..db8fe1e5 100644 --- a/src/main/java/com/sqx/modules/taskCenter/service/impl/TaskCenterServiceImpl.java +++ b/src/main/java/com/sqx/modules/taskCenter/service/impl/TaskCenterServiceImpl.java @@ -183,6 +183,20 @@ public class TaskCenterServiceImpl extends ServiceImpl users = userInfoService.getUsersByNameAndCertNo(userInfo.getCertName(), userInfo.getCertNo()); + Set courseIds = users.stream().map(UserInfo::getUserId).collect(Collectors.toSet()); + if (recordService.countTaskNum(courseIds, s.getId(), null) > 0) { + if (inviteAchievement != null) { + inviteAchievementService.update(new LambdaUpdateWrapper() + .eq(InviteAchievement::getUserId, inviteAchievement.getUserId()) + .eq(InviteAchievement::getId, inviteAchievement.getId()) + .set(InviteAchievement::getTasks, StringUtils.isBlank(inviteAchievement.getTasks()) ? "1" : inviteAchievement.getTasks() + ",1")); + } + continue; + } + } Integer sumOrderNum = 0; if (inviteAchievement != null) { sumOrderNum = inviteAchievement.getCount(); @@ -190,19 +204,11 @@ public class TaskCenterServiceImpl extends ServiceImpl users = userInfoService.getUsersByNameAndCertNo(userInfo.getCertName(), userInfo.getCertNo()); - Set courseIds = users.stream().map(UserInfo::getUserId).collect(Collectors.toSet()); - if (recordService.countTaskNum(courseIds, s.getId(), null) > 0) { - continue; - } - } else if (recordService.countTaskNum(userId, s.getId(), null) > 0) { - s.setDiscNumber(0); - s.setNumber(null); - s.setJumpType(0); - } + } + if (recordService.countTaskNum(userId, s.getId(), null) > 0) { + s.setDiscNumber(0); + s.setNumber(null); + s.setJumpType(0); } } break;