From f38d7861704cd16533066df9b55bab527cc91892 Mon Sep 17 00:00:00 2001
From: wangw <1594593906@qq.com>
Date: Thu, 16 Jan 2025 14:49:08 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BB=BB=E5=8A=A1=E4=B8=AD=E5=BF=83=20?=
 =?UTF-8?q?=E4=B8=80=E6=AC=A1=E6=80=A7=E4=BB=BB=E5=8A=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/TaskCenterServiceImpl.java   | 29 ++++++++++++-------
 1 file changed, 18 insertions(+), 11 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 23daef53..f1a7c8b2 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
@@ -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;