From 0bdf1c585d74c9e087ac3723bbe1dfa3e5e00f48 Mon Sep 17 00:00:00 2001 From: wangw <1594593906@qq.com> Date: Wed, 11 Dec 2024 10:13:13 +0800 Subject: [PATCH 1/8] =?UTF-8?q?=E5=89=A9=E4=BD=99=E6=AC=A1=E6=95=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modules/taskCenter/service/impl/TaskCenterServiceImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 1abd6ec7..03daed48 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 @@ -75,9 +75,9 @@ public class TaskCenterServiceImpl extends ServiceImpl 0) { + s.setDiscNumber(s.getNumber() - signRecordList.size()); s.setDisabled(false); s.setNumber(null); - s.setDiscNumber(s.getNumber() - signRecordList.size()); } } From d001b23e7fbe2eeafd90849084b9fb4c9e8934a2 Mon Sep 17 00:00:00 2001 From: wangw <1594593906@qq.com> Date: Wed, 11 Dec 2024 10:21:17 +0800 Subject: [PATCH 2/8] =?UTF-8?q?=E6=AF=8F=E6=97=A5=E6=AC=A1=E6=95=B0=20?= =?UTF-8?q?=E6=B0=B8=E8=BF=9C=E5=8F=AF=E7=82=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../taskCenter/service/impl/TaskCenterServiceImpl.java | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) 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 03daed48..6454af37 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 @@ -63,8 +63,12 @@ public class TaskCenterServiceImpl extends ServiceImpl 0) { s.setDiscNumber(dayOrderNum); s.setNumber(3); - s.setDisabled(false); +// s.setDisabled(false); todaySign = false; + }else { + s.setDiscNumber(0); + s.setNumber(3); + s.setJumpType(0); } } else { if (todaySign) { 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 3/8] =?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 taskPage = baseMapper.selectPage(new Page<>(1, 50), new QueryWrapper().eq("shows", 1).orderByAsc("sort","type")); + IPage taskPage = baseMapper.selectPage(new Page<>(1, 50), new QueryWrapper().eq("shows", 1).orderByAsc("sort", "type")); boolean todaySign = true; //月 签到记录 QueryWrapper signWrapper = new QueryWrapper<>(); @@ -60,28 +60,38 @@ public class TaskCenterServiceImpl extends ServiceImpl 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); } } From a9ca0f4fb26820244ee86e6256b52f6bb56abf9b Mon Sep 17 00:00:00 2001 From: wangw <1594593906@qq.com> Date: Wed, 11 Dec 2024 10:39:42 +0800 Subject: [PATCH 4/8] =?UTF-8?q?=E8=BE=BE=E6=A0=87=20=E7=BD=AE=E4=B8=BAnull?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modules/taskCenter/service/impl/TaskCenterServiceImpl.java | 3 +-- 1 file changed, 1 insertion(+), 2 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 af5c4218..f7086002 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 @@ -69,9 +69,8 @@ public class TaskCenterServiceImpl extends ServiceImpl Date: Wed, 11 Dec 2024 10:45:49 +0800 Subject: [PATCH 5/8] =?UTF-8?q?=E8=BE=BE=E6=A0=87=20=E7=BD=AE=E4=B8=BAnull?= =?UTF-8?q?=20=E4=BB=BB=E5=8A=A1=E9=A2=86=E5=8F=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../sqx/modules/taskCenter/entity/TaskCenterRecord.java | 7 ++----- .../taskCenter/service/impl/TaskCenterServiceImpl.java | 2 ++ 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/src/main/java/com/sqx/modules/taskCenter/entity/TaskCenterRecord.java b/src/main/java/com/sqx/modules/taskCenter/entity/TaskCenterRecord.java index 38e6dc2e..e85949a2 100644 --- a/src/main/java/com/sqx/modules/taskCenter/entity/TaskCenterRecord.java +++ b/src/main/java/com/sqx/modules/taskCenter/entity/TaskCenterRecord.java @@ -31,14 +31,11 @@ public class TaskCenterRecord extends Model { private String name; @ApiModelProperty("奖励类型 1 金豆 2 现金 3 4 5") private Integer type; - @ApiModelProperty("${column.comment}") private Long targetId; @ApiModelProperty("数量") private Integer number; - @ApiModelProperty("${column.comment}") - private Date createTime; - @ApiModelProperty("${column.comment}") - private Date updateTime; + private String createTime; + private String updateTime; } 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 f7086002..a7aa12ac 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 @@ -185,6 +185,8 @@ public class TaskCenterServiceImpl extends ServiceImpl Date: Wed, 11 Dec 2024 10:49:09 +0800 Subject: [PATCH 6/8] =?UTF-8?q?=E9=87=8D=E5=A4=8D=E9=A2=86=E5=8F=96?= =?UTF-8?q?=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../taskCenter/service/impl/TaskCenterRecordServiceImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/com/sqx/modules/taskCenter/service/impl/TaskCenterRecordServiceImpl.java b/src/main/java/com/sqx/modules/taskCenter/service/impl/TaskCenterRecordServiceImpl.java index b7c46ebc..ba48c8d9 100644 --- a/src/main/java/com/sqx/modules/taskCenter/service/impl/TaskCenterRecordServiceImpl.java +++ b/src/main/java/com/sqx/modules/taskCenter/service/impl/TaskCenterRecordServiceImpl.java @@ -17,7 +17,7 @@ public class TaskCenterRecordServiceImpl extends ServiceImpl().eq("user_id", userId).eq("task_id", taskId).lt("create_time", time)); + return baseMapper.selectCount(new QueryWrapper().eq("user_id", userId).eq("task_id", taskId).gt("create_time", time)); } } From dddc34326169ef9da107681aa40b2e6e571a3bc7 Mon Sep 17 00:00:00 2001 From: wangw <1594593906@qq.com> Date: Wed, 11 Dec 2024 10:52:03 +0800 Subject: [PATCH 7/8] =?UTF-8?q?=E5=B7=B2=E9=A2=86=E5=8F=96=E5=90=8E=20numb?= =?UTF-8?q?er=E7=BD=AE=E7=A9=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modules/taskCenter/service/impl/TaskCenterServiceImpl.java | 3 +++ 1 file changed, 3 insertions(+) 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 a7aa12ac..cef21b24 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 @@ -67,6 +67,7 @@ public class TaskCenterServiceImpl extends ServiceImpl 0) { s.setButtonTitle("已领取"); + s.setNumber(null); s.setDisabled(false); } else { s.setDiscNumber(0); @@ -82,6 +83,7 @@ public class TaskCenterServiceImpl extends ServiceImpl 0) { s.setButtonTitle("已领取"); s.setDisabled(false); + s.setNumber(null); } } else { if ((signRecordList.size() < s.getNumber().intValue())) { @@ -91,6 +93,7 @@ public class TaskCenterServiceImpl extends ServiceImpl 0) { s.setButtonTitle("已领取"); s.setDisabled(false); + s.setNumber(null); } } From 1d714f73834b8b6eb944cda473c60f2eb32f05ff Mon Sep 17 00:00:00 2001 From: wangw <1594593906@qq.com> Date: Wed, 11 Dec 2024 10:59:40 +0800 Subject: [PATCH 8/8] =?UTF-8?q?=E5=A5=96=E5=8A=B1=E7=B1=BB=E5=9E=8B=209=20?= =?UTF-8?q?=E4=B8=BA=E5=A4=A7=E8=BD=AC=E7=9B=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/sqx/modules/taskCenter/entity/TaskCenterRecord.java | 2 +- .../com/sqx/modules/taskCenter/entity/TaskCenterReward.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/sqx/modules/taskCenter/entity/TaskCenterRecord.java b/src/main/java/com/sqx/modules/taskCenter/entity/TaskCenterRecord.java index e85949a2..38a6b936 100644 --- a/src/main/java/com/sqx/modules/taskCenter/entity/TaskCenterRecord.java +++ b/src/main/java/com/sqx/modules/taskCenter/entity/TaskCenterRecord.java @@ -29,7 +29,7 @@ public class TaskCenterRecord extends Model { private Long taskId; @ApiModelProperty("奖励名称") private String name; - @ApiModelProperty("奖励类型 1 金豆 2 现金 3 4 5") + @ApiModelProperty("奖励类型 1 金豆 2 现金 3 4 5 9转盘") private Integer type; private Long targetId; @ApiModelProperty("数量") diff --git a/src/main/java/com/sqx/modules/taskCenter/entity/TaskCenterReward.java b/src/main/java/com/sqx/modules/taskCenter/entity/TaskCenterReward.java index 5e8c3fa4..3047bf0d 100644 --- a/src/main/java/com/sqx/modules/taskCenter/entity/TaskCenterReward.java +++ b/src/main/java/com/sqx/modules/taskCenter/entity/TaskCenterReward.java @@ -27,7 +27,7 @@ public class TaskCenterReward extends Model { private Long taskId; @ApiModelProperty("奖励名称") private String name; - @ApiModelProperty("奖励类型 1 金豆 2 现金红包 3 4 5 6 大转盘抽奖次数") + @ApiModelProperty("奖励类型 1 金豆 2 现金红包 3 4 5 9 大转盘抽奖次数") private Integer type; private Integer targetId; @ApiModelProperty("数量")