From 2264874d072c815d6ac2cd6f16de15e6f8516663 Mon Sep 17 00:00:00 2001
From: Administrator <15274802129@163.com>
Date: Mon, 12 May 2025 16:53:29 +0800
Subject: [PATCH] refactor(mall): 优化签到记录的总天数重置逻辑
---
src/main/java/cc/mrbird/febs/mall/service/impl/ScoreServiceImpl.java | 16 ++++++++--------
1 files changed, 8 insertions(+), 8 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 ed0a2b2..e097d74 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
@@ -26,6 +26,7 @@
import cn.hutool.core.date.DateTime;
import cn.hutool.core.date.DateUnit;
import cn.hutool.core.date.DateUtil;
+import cn.hutool.core.util.StrUtil;
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -166,7 +167,7 @@
}
// 若最新签到日期，与当天相差大于一天，则更新数据库(避免定时器更新失败)
- if (DateUtil.betweenDay(mallScoreSignRecord.getSignTime(), new Date(), true) > 1 || mallScoreSignRecord.getTotalCnt() == 7) {
+ if (DateUtil.betweenDay(mallScoreSignRecord.getSignTime(), new Date(), true) > 1) {
mallScoreSignRecord.setTotalCnt(0);
mallScoreSignRecordMapper.updateById(mallScoreSignRecord);
}
@@ -182,19 +183,18 @@
// 创建分页对象，传入当前页和每页大小
Page<MallMoneyFlow> page = new Page<>(dto.getPageNow(), dto.getPageSize());
LambdaQueryWrapper<MallMoneyFlow> mallMoneyFlowLambdaQueryWrapper = new LambdaQueryWrapper<>();
+ List<Integer> integers = Arrays.asList(ScoreFlowTypeEnum.SIGN_SCORE.getValue(), ScoreFlowTypeEnum.SIGN_EXPERIENCE.getValue());
mallMoneyFlowLambdaQueryWrapper
- .select(MallMoneyFlow::getCreatedTime, MallMoneyFlow::getAmount)
+ .select(MallMoneyFlow::getCreatedTime, MallMoneyFlow::getRemark)
.eq(MallMoneyFlow::getMemberId, memberId)
- .eq(MallMoneyFlow::getFlowType, FlowTypeEnum.PRIZE_SCORE.getValue())
- .eq(MallMoneyFlow::getType, MoneyFlowTypeEnum.SCORE_SIGN.getValue())
+ .in(MallMoneyFlow::getType, integers)
.orderByDesc(MallMoneyFlow::getId)
;
- // 调用Mapper方法获取活动分页数据
Page<MallMoneyFlow> mallMoneyFlowPage = mallMoneyFlowService.getBaseMapper().selectPage(page, mallMoneyFlowLambdaQueryWrapper);
if(CollUtil.isNotEmpty(mallMoneyFlowPage.getRecords())){
mallMoneyFlowPage.getRecords().forEach(item -> {
ApiSignListVo apiSignListVo = new ApiSignListVo();
- apiSignListVo.setAmount(item.getAmount());
+ apiSignListVo.setRemark(item.getRemark());
apiSignListVo.setCreatedTime(item.getCreatedTime());
apiSignListVos.add(apiSignListVo);
});
@@ -297,7 +297,7 @@
ScoreFlowTypeEnum.SIGN_EXPERIENCE.getValue(),
mallScoreSignRecord.getId().toString(),
FlowTypeEnum.SCORE.getValue(),
- ScoreFlowTypeEnum.SIGN_EXPERIENCE.getDesc(),
+ StrUtil.format(ScoreFlowTypeEnum.SIGN_EXPERIENCE.getDesc(),amount),
2);
}
if(mostSignIn == 2){
@@ -308,7 +308,7 @@
ScoreFlowTypeEnum.SIGN_SCORE.getValue(),
mallScoreSignRecord.getId().toString(),
FlowTypeEnum.PRIZE_SCORE.getValue(),
- ScoreFlowTypeEnum.SIGN_SCORE.getDesc(),
+ StrUtil.format(ScoreFlowTypeEnum.SIGN_SCORE.getDesc(),amount),
2);
}
--
Gitblit v1.9.1