From 5607bfcd8eaa5dae1893f69447dc16f593f0c92b Mon Sep 17 00:00:00 2001
From: wangw <1594593906@qq.com>
Date: Wed, 11 Dec 2024 10:31:35 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BB=BB=E5=8A=A1=20=E6=98=AF=E5=90=A6?=
 =?UTF-8?q?=E5=B7=B2=E9=A2=86=E5=8F=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/TaskCenterServiceImpl.java   | 20 ++++++++++++++-----
 1 file changed, 15 insertions(+), 5 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 6454af37..af5c4218 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
@@ -47,7 +47,7 @@ public class TaskCenterServiceImpl extends ServiceImpl<TaskCenterDao, TaskCenter
     @Override
     public Result queryTaskCenter(Long userId) {
         //任务
-        IPage<TaskCenter> taskPage = baseMapper.selectPage(new Page<>(1, 50), new QueryWrapper<TaskCenter>().eq("shows", 1).orderByAsc("sort","type"));
+        IPage<TaskCenter> taskPage = baseMapper.selectPage(new Page<>(1, 50), new QueryWrapper<TaskCenter>().eq("shows", 1).orderByAsc("sort", "type"));
         boolean todaySign = true;
         //月 签到记录
         QueryWrapper<UserSignRecord> signWrapper = new QueryWrapper<>();
@@ -60,28 +60,38 @@ public class TaskCenterServiceImpl extends ServiceImpl<TaskCenterDao, TaskCenter
             if (s.getType() == 2) {
                 if (s.getNumber().equals(1)) {
                     Integer dayOrderNum = ordersService.countOrderNum(userId, DateUtil.today() + " 00:00:00");
-                    if (dayOrderNum < 3 || recordService.countTaskNum(userId, s.getId(), DateUtil.today() + " 00:00:00") > 0) {
+                    if (dayOrderNum < 3) {
                         s.setDiscNumber(dayOrderNum);
                         s.setNumber(3);
 //                        s.setDisabled(false);
                         todaySign = false;
-                    }else {
+                    } else if (recordService.countTaskNum(userId, s.getId(), DateUtil.today() + " 00:00:00") > 0) {
+                        s.setButtonTitle("已领取");
+                        s.setDisabled(false);
+                    } else {
+                        s.setButtonTitle("");
                         s.setDiscNumber(0);
                         s.setNumber(3);
                         s.setJumpType(0);
                     }
                 } else {
                     if (todaySign) {
-                        if ((signRecordList.size() < (s.getNumber().intValue() - 1)) || recordService.countTaskNum(userId, s.getId(), DateUtil.beginOfMonth(new Date()).toString()) > 0) {
+                        if ((signRecordList.size() < (s.getNumber().intValue() - 1))) {
                             s.setDiscNumber(s.getNumber() - signRecordList.size());
                             s.setNumber(null);
                             s.setDisabled(false);
+                        } else if (recordService.countTaskNum(userId, s.getId(), DateUtil.beginOfMonth(new Date()).toString()) > 0) {
+                            s.setButtonTitle("已领取");
+                            s.setDisabled(false);
                         }
                     } else {
-                        if ((signRecordList.size() < s.getNumber().intValue()) || recordService.countTaskNum(userId, s.getId(), DateUtil.beginOfMonth(new Date()).toString()) > 0) {
+                        if ((signRecordList.size() < s.getNumber().intValue())) {
                             s.setDiscNumber(s.getNumber() - signRecordList.size());
                             s.setDisabled(false);
                             s.setNumber(null);
+                        } else if (recordService.countTaskNum(userId, s.getId(), DateUtil.beginOfMonth(new Date()).toString()) > 0) {
+                            s.setButtonTitle("已领取");
+                            s.setDisabled(false);
                         }
                     }