From feb9efd440c1a36e5575b0a9ed6293808198e024 Mon Sep 17 00:00:00 2001
From: Administrator <15274802129@163.com>
Date: Wed, 14 May 2025 09:54:31 +0800
Subject: [PATCH] feat(mall): 更新会员钱包相关功能
---
src/main/java/cc/mrbird/febs/mall/service/impl/ScoreServiceImpl.java | 15 +++++++--------
1 files changed, 7 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 2fc1a19..f2f6832 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
@@ -90,11 +90,11 @@
long between = DateUtil.between(startTime, endTime, DateUnit.DAY);
List<ApiGetRunDateVo> apiGetRunDateVos = generateDateList(startTime, between);
+ List<Integer> typeList = Arrays.asList(ScoreFlowTypeEnum.SIGN_SCORE.getValue(), ScoreFlowTypeEnum.SIGN_EXPERIENCE.getValue());
List<MallMoneyFlow> mallMoneyFlows = mallMoneyFlowService.getBaseMapper().selectList(
new LambdaQueryWrapper<MallMoneyFlow>()
.eq(MallMoneyFlow::getMemberId, memberId)
- .eq(MallMoneyFlow::getFlowType, FlowTypeEnum.PRIZE_SCORE.getValue())
- .eq(MallMoneyFlow::getType, MoneyFlowTypeEnum.SCORE_SIGN.getValue())
+ .in(MallMoneyFlow::getType, typeList)
.ge(MallMoneyFlow::getCreatedTime, startTime)
.le(MallMoneyFlow::getCreatedTime, endTime)
);
@@ -167,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);
}
@@ -183,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);
});
--
Gitblit v1.9.1