From 8f7f9e55a338fb55dca5103963e0f87bc0fff7fb Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Sat, 28 May 2022 10:32:01 +0800
Subject: [PATCH] fix sign score
---
src/main/java/cc/mrbird/febs/mall/service/IScoreService.java | 3 +++
src/main/java/cc/mrbird/febs/mall/service/impl/ScoreServiceImpl.java | 24 +++++++++++++++++++++---
2 files changed, 24 insertions(+), 3 deletions(-)
diff --git a/src/main/java/cc/mrbird/febs/mall/service/IScoreService.java b/src/main/java/cc/mrbird/febs/mall/service/IScoreService.java
index 7a644e9..13fa00d 100644
--- a/src/main/java/cc/mrbird/febs/mall/service/IScoreService.java
+++ b/src/main/java/cc/mrbird/febs/mall/service/IScoreService.java
@@ -1,5 +1,6 @@
package cc.mrbird.febs.mall.service;
+import cc.mrbird.febs.mall.entity.MallScoreSignRecord;
import cc.mrbird.febs.mall.vo.ScoreSignVo;
public interface IScoreService {
@@ -7,4 +8,6 @@
ScoreSignVo scoreSign();
void sign();
+
+ MallScoreSignRecord judgeScoreIsContinuity(MallScoreSignRecord mallScoreSignRecord);
}
diff --git a/src/main/java/cc/mrbird/febs/mall/service/impl/ScoreServiceImpl.java b/src/main/java/cc/mrbird/febs/mall/service/impl/ScoreServiceImpl.java
index 0a226c7..6dfb13f 100644
--- a/src/main/java/cc/mrbird/febs/mall/service/impl/ScoreServiceImpl.java
+++ b/src/main/java/cc/mrbird/febs/mall/service/impl/ScoreServiceImpl.java
@@ -17,6 +17,7 @@
import cc.mrbird.febs.mall.service.IMallMoneyFlowService;
import cc.mrbird.febs.mall.service.IScoreService;
import cc.mrbird.febs.mall.vo.ScoreSignVo;
+import cn.hutool.core.date.DateField;
import cn.hutool.core.date.DateTime;
import cn.hutool.core.date.DateUnit;
import cn.hutool.core.date.DateUtil;
@@ -54,13 +55,29 @@
ScoreSignVo scoreSign = new ScoreSignVo();
scoreSign.setMineScore(wallet.getPrizeScore().intValue());
- scoreSign.setHasSignDays(mallScoreSignRecord == null ? 0 : mallScoreSignRecord.getTotalCnt());
+
+ if (mallScoreSignRecord == null) {
+ scoreSign.setHasSignDays(0);
+ } else {
+ mallScoreSignRecord = judgeScoreIsContinuity(mallScoreSignRecord);
+ scoreSign.setHasSignDays(mallScoreSignRecord.getTotalCnt());
+ }
DataDictionaryCustom dic = dataDictionaryCustomMapper.selectDicDataByTypeAndCode(DataDictionaryEnum.SCORE_SIGN_SETTING.getType(), DataDictionaryEnum.SCORE_SIGN_SETTING.getCode());
if (dic != null) {
scoreSign.setSetting(JSONObject.parseObject(dic.getValue(), ScoreSettingDto.class));
}
return scoreSign;
+ }
+
+ @Override
+ public MallScoreSignRecord judgeScoreIsContinuity(MallScoreSignRecord mallScoreSignRecord) {
+ // 若最新签到日期，与当天相差大于一天，则更新数据库(避免定时器更新失败)
+ if (DateUtil.betweenDay(mallScoreSignRecord.getSignTime(), new Date(), true) > 1 || mallScoreSignRecord.getTotalCnt() == 7) {
+ mallScoreSignRecord.setTotalCnt(0);
+ mallScoreSignRecordMapper.updateById(mallScoreSignRecord);
+ }
+ return mallScoreSignRecord;
}
@Override
@@ -76,10 +93,11 @@
MallScoreSignRecord mallScoreSignRecord = mallScoreSignRecordMapper.selectRecentSignRecord(member.getId());
if (mallScoreSignRecord == null) {
mallScoreSignRecord = new MallScoreSignRecord();
+ } else {
+ mallScoreSignRecord = judgeScoreIsContinuity(mallScoreSignRecord);
}
- String format = DateUtil.format(mallScoreSignRecord.getSignTime(), "yyyy-MM-dd");
- if (mallScoreSignRecord.getSignTime() != null && DateUtil.between(DateUtil.parse(format, "yyyy-MM-dd"), new Date(), DateUnit.DAY) == 0) {
+ if (mallScoreSignRecord.getSignTime() != null && DateUtil.betweenDay(mallScoreSignRecord.getSignTime(), new Date(), true) == 0) {
throw new FebsException("今天已签到");
}
--
Gitblit v1.9.1