From a52dcadd2df565879ee52618b1d521945ef50fb6 Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Sat, 28 May 2022 10:04:36 +0800
Subject: [PATCH] fix sign
---
src/main/java/cc/mrbird/febs/mall/service/impl/ScoreServiceImpl.java | 10 ++++++----
1 files changed, 6 insertions(+), 4 deletions(-)
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 19c4605..0a226c7 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.DateTime;
import cn.hutool.core.date.DateUnit;
import cn.hutool.core.date.DateUtil;
import com.alibaba.fastjson.JSONObject;
@@ -49,12 +50,13 @@
MallMemberWallet wallet = mallMemberWalletMapper.selectWalletByMemberId(member.getId());
+ MallScoreSignRecord mallScoreSignRecord = mallScoreSignRecordMapper.selectRecentSignRecord(member.getId());
+
ScoreSignVo scoreSign = new ScoreSignVo();
scoreSign.setMineScore(wallet.getPrizeScore().intValue());
- scoreSign.setHasSignDays(1);
+ scoreSign.setHasSignDays(mallScoreSignRecord == null ? 0 : 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));
}
@@ -76,8 +78,8 @@
mallScoreSignRecord = new MallScoreSignRecord();
}
- System.out.println(DateUtil.between(mallScoreSignRecord.getSignTime(), new Date(), DateUnit.DAY));
- if (mallScoreSignRecord.getSignTime() != null && DateUtil.between(mallScoreSignRecord.getSignTime(), new Date(), DateUnit.DAY) == 0) {
+ 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) {
throw new FebsException("今天已签到");
}
--
Gitblit v1.9.1