From 5333c8775e18e0af2d9b8495065f63ee7765baf2 Mon Sep 17 00:00:00 2001
From: wangw <1594593906@qq.com>
Date: Wed, 11 Dec 2024 09:34:14 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BB=BB=E5=8A=A1=E5=89=A9=E4=BD=99=E6=AC=A1?=
 =?UTF-8?q?=E6=95=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/sqx/modules/taskCenter/entity/TaskCenter.java    | 2 +-
 .../taskCenter/service/impl/TaskCenterServiceImpl.java   | 9 +++------
 2 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/src/main/java/com/sqx/modules/taskCenter/entity/TaskCenter.java b/src/main/java/com/sqx/modules/taskCenter/entity/TaskCenter.java
index 0ac5061a..e4527d6c 100644
--- a/src/main/java/com/sqx/modules/taskCenter/entity/TaskCenter.java
+++ b/src/main/java/com/sqx/modules/taskCenter/entity/TaskCenter.java
@@ -54,7 +54,7 @@ public class TaskCenter extends Model<TaskCenter> {
     private Integer shows;
 
     @TableField(exist = false)
-    private Integer discNumber;
+    private Integer discNumber = 0;
     @TableField(exist = false)
     private boolean disabled = true;
 
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 833e70cf..8b3d4914 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
@@ -61,23 +61,20 @@ public class TaskCenterServiceImpl extends ServiceImpl<TaskCenterDao, TaskCenter
                 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) {
+                        s.setDiscNumber(dayOrderNum);
                         s.setDisabled(false);
                         todaySign = false;
                     }
                 } else {
                     if (todaySign) {
                         if ((signRecordList.size() < (s.getNumber().intValue() - 1)) || recordService.countTaskNum(userId, s.getId(), DateUtil.beginOfMonth(new Date()).toString()) > 0) {
-                            s.setNumber(s.getNumber() - signRecordList.size());
+                            s.setDiscNumber(s.getNumber() - signRecordList.size());
                             s.setDisabled(false);
-                        }else {
-                            s.setNumber(0);
                         }
                     } else {
                         if ((signRecordList.size() < s.getNumber().intValue()) || recordService.countTaskNum(userId, s.getId(), DateUtil.beginOfMonth(new Date()).toString()) > 0) {
                             s.setDisabled(false);
-                            s.setNumber(s.getNumber() - signRecordList.size());
-                        }else {
-                            s.setNumber(0);
+                            s.setDiscNumber(s.getNumber() - signRecordList.size());
                         }
                     }