From b6c0815a5985be7ce0b2d949f3fde0df2b64c69e Mon Sep 17 00:00:00 2001 From: wangw <1594593906@qq.com> Date: Tue, 10 Dec 2024 16:30:08 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E9=A1=BA=E5=BA=8F=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modules/discSpinning/controller/DiscSpinningController.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/main/java/com/sqx/modules/discSpinning/controller/DiscSpinningController.java b/src/main/java/com/sqx/modules/discSpinning/controller/DiscSpinningController.java index bb74e625..7e6d9514 100644 --- a/src/main/java/com/sqx/modules/discSpinning/controller/DiscSpinningController.java +++ b/src/main/java/com/sqx/modules/discSpinning/controller/DiscSpinningController.java @@ -210,6 +210,8 @@ public class DiscSpinningController { UserMoneyDetails userMoneyDetails = new UserMoneyDetails( receive.getUserId(), null, null, "[现金大转盘]", 5, 1, 2, receive.getNumber(), "现金红包奖励" + receive.getNumber() + "元"); + //上一秒 + userMoneyDetails.setCreateTime(DateUtil.format(new Date(System.currentTimeMillis() - 1000), "yyyy-MM-dd HH:mm:ss")); userMoneyDetailsService.save(userMoneyDetails); receive.setTarget("2"); receive.setTargetId(userMoneyDetails.getId()); From 38572e907729b5232f4e1f5470a5d669844018a5 Mon Sep 17 00:00:00 2001 From: wangw <1594593906@qq.com> Date: Tue, 10 Dec 2024 17:55:11 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E7=AD=BE=E5=88=B0=E4=BB=BB=E5=8A=A1=20?= =?UTF-8?q?=E5=89=A9=E4=BD=99=20=E6=AC=A1=E6=95=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../taskCenter/service/impl/TaskCenterServiceImpl.java | 6 ++++++ 1 file changed, 6 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 0ec979fd..833e70cf 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,11 +67,17 @@ public class TaskCenterServiceImpl extends ServiceImpl 0) { + s.setNumber(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); } } 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 3/3] =?UTF-8?q?=E4=BB=BB=E5=8A=A1=E5=89=A9=E4=BD=99?= =?UTF-8?q?=E6=AC=A1=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 { 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 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()); } }