From 61a8a1b57718b83b6f8ac09e817fabf09e96fdc0 Mon Sep 17 00:00:00 2001
From: Administrator <15274802129@163.com>
Date: Mon, 19 May 2025 18:01:56 +0800
Subject: [PATCH] fix(member): 修正会员累计订单统计
---
src/main/java/cc/mrbird/febs/mall/service/impl/ScoreServiceImpl.java | 65 ++++++++++++++++++++++----------
1 files changed, 44 insertions(+), 21 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 7785770..7393804 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
@@ -4,8 +4,10 @@
import cc.mrbird.febs.common.enumerates.DataDictionaryEnum;
import cc.mrbird.febs.common.enumerates.FlowTypeEnum;
import cc.mrbird.febs.common.enumerates.MoneyFlowTypeEnum;
+import cc.mrbird.febs.common.enumerates.ScoreFlowTypeEnum;
import cc.mrbird.febs.common.exception.FebsException;
import cc.mrbird.febs.common.utils.LoginUserUtil;
+import cc.mrbird.febs.common.utils.MallUtils;
import cc.mrbird.febs.mall.dto.ScoreSettingDto;
import cc.mrbird.febs.mall.dto.signActivity.ApiSignDataDto;
import cc.mrbird.febs.mall.dto.signActivity.ApiSignListDto;
@@ -20,10 +22,12 @@
import cc.mrbird.febs.mall.vo.ScoreSignVo;
import cc.mrbird.febs.mall.vo.signActivity.ApiGetRunDateVo;
import cc.mrbird.febs.mall.vo.signActivity.ApiSignListVo;
+import cc.mrbird.febs.mall.vo.signActivity.ApiSignVo;
import cn.hutool.core.collection.CollUtil;
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;
@@ -33,10 +37,7 @@
import org.springframework.transaction.annotation.Transactional;
import java.math.BigDecimal;
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
import java.util.stream.Collectors;
import java.util.stream.IntStream;
@@ -90,11 +91,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 +168,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 +184,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);
});
@@ -205,7 +205,7 @@
@Override
@Transactional(rollbackFor = Exception.class)
- public void sign() {
+ public FebsResponse sign() {
MallMember member = LoginUserUtil.getLoginUser();
DataDictionaryCustom dic = dataDictionaryCustomMapper.selectDicDataByTypeAndCode(DataDictionaryEnum.SCORE_SIGN_SETTING.getType(), DataDictionaryEnum.SCORE_SIGN_SETTING.getCode());
@@ -285,14 +285,37 @@
mallScoreSignRecord.setTotalCnt(days);
mallScoreSignRecord.setSignTime(new Date());
mallScoreSignRecordMapper.insert(mallScoreSignRecord);
-
+ /**
+ * 1:会员经验 2:会员积分
+ */
+ Integer mostSignIn = scoreSetting.getMostSignIn();
BigDecimal amount = BigDecimal.valueOf(mallScoreSignRecord.getScore());
- walletService.add(amount, member.getId(), "prizeScore");
- mallMoneyFlowService.addMoneyFlow(
- member.getId(),
- amount,
- MoneyFlowTypeEnum.SCORE_SIGN.getValue(),
- null,
- FlowTypeEnum.PRIZE_SCORE.getValue());
+ if(mostSignIn == 1){
+ walletService.add(amount, member.getId(), "score");
+ mallMoneyFlowService.addMoneyFlow(
+ member.getId(),
+ amount,
+ ScoreFlowTypeEnum.SIGN_EXPERIENCE.getValue(),
+ MallUtils.getOrderNum("s"),
+ FlowTypeEnum.SCORE.getValue(),
+ StrUtil.format(ScoreFlowTypeEnum.SIGN_EXPERIENCE.getDesc(),amount),
+ 2);
+ }
+ if(mostSignIn == 2){
+ walletService.add(amount, member.getId(), "prizeScore");
+ mallMoneyFlowService.addMoneyFlow(
+ member.getId(),
+ amount,
+ ScoreFlowTypeEnum.SIGN_SCORE.getValue(),
+ MallUtils.getOrderNum("s"),
+ FlowTypeEnum.PRIZE_SCORE.getValue(),
+ StrUtil.format(ScoreFlowTypeEnum.SIGN_SCORE.getDesc(),amount),
+ 2);
+ }
+
+ ApiSignVo apiSignVo = new ApiSignVo();
+ apiSignVo.setMineScore(mallScoreSignRecord.getScore());
+ apiSignVo.setMostSignIn(mostSignIn);
+ return new FebsResponse().success().data(apiSignVo);
}
}
--
Gitblit v1.9.1