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()); 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 0ec979fd..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,17 +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.setDiscNumber(s.getNumber() - signRecordList.size()); s.setDisabled(false); } } else { if ((signRecordList.size() < s.getNumber().intValue()) || recordService.countTaskNum(userId, s.getId(), DateUtil.beginOfMonth(new Date()).toString()) > 0) { s.setDisabled(false); + s.setDiscNumber(s.getNumber() - signRecordList.size()); } }