From cadeca36ff86f74371c77a05dc8422abc1e48855 Mon Sep 17 00:00:00 2001
From: KKSU <15274802129@163.com>
Date: Thu, 19 Dec 2024 16:28:40 +0800
Subject: [PATCH] feat(table): 添加合计行功能 - 在 mallMemberList.html 中添加了 totalRow 属性，用于显示碳币和碳积分的合计 - 在 moneyFlowList.html 中移除了 description 字段的 totalRow属性 - 在 sellVipList.html 中将 amount 和 amountFee 字段的 totalRow 属性改为 true
---
src/main/java/cc/mrbird/febs/mall/service/impl/ScoreServiceImpl.java | 28 +++++++++++++++++++++++++---
1 files changed, 25 insertions(+), 3 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 0a226c7..62d0087 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,33 @@
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 (mallScoreSignRecord.getSignTime() == null) {
+ return mallScoreSignRecord;
+ }
+
+ // 若最新签到日期，与当天相差大于一天，则更新数据库(避免定时器更新失败)
+ if (DateUtil.betweenDay(mallScoreSignRecord.getSignTime(), new Date(), true) > 1 || mallScoreSignRecord.getTotalCnt() == 7) {
+ mallScoreSignRecord.setTotalCnt(0);
+ mallScoreSignRecordMapper.updateById(mallScoreSignRecord);
+ }
+ return mallScoreSignRecord;
}
@Override
@@ -78,11 +99,12 @@
mallScoreSignRecord = new 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("今天已签到");
}
+ mallScoreSignRecord = judgeScoreIsContinuity(mallScoreSignRecord);
+
ScoreSettingDto scoreSetting = JSONObject.parseObject(dic.getValue(),ScoreSettingDto.class);
int days = mallScoreSignRecord.getTotalCnt() == null ? 1 : mallScoreSignRecord.getTotalCnt() + 1;
switch (days) {
--
Gitblit v1.9.1