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/ApiMallActServiceImpl.java | 79 ++++++++++++++++++++++++++++++++++++---
1 files changed, 72 insertions(+), 7 deletions(-)
diff --git a/src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallActServiceImpl.java b/src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallActServiceImpl.java
index b8ffd31..b4722f6 100644
--- a/src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallActServiceImpl.java
+++ b/src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallActServiceImpl.java
@@ -1,13 +1,19 @@
package cc.mrbird.febs.mall.service.impl;
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.ApiMallActListDto;
import cc.mrbird.febs.mall.dto.ApiMallActWinDetailsDto;
import cc.mrbird.febs.mall.entity.*;
import cc.mrbird.febs.mall.mapper.*;
import cc.mrbird.febs.mall.service.IApiMallActService;
+import cc.mrbird.febs.mall.service.IApiMallMemberWalletService;
+import cc.mrbird.febs.mall.service.IMallMoneyFlowService;
import cc.mrbird.febs.mall.vo.*;
import cn.hutool.core.util.*;
import cn.hutool.core.collection.CollUtil;
@@ -34,6 +40,8 @@
private final MallActLuckdrawRecordMapper mallActLuckdrawRecordMapper;
private final MallMemberWalletMapper mallMemberWalletMapper;
private final DataDictionaryCustomMapper dataDictionaryCustomMapper;
+ private final IMallMoneyFlowService mallMoneyFlowService;
+ private final IApiMallMemberWalletService mallMemberWalletService;
@Override
public IPage<ApiMallActListVo> findApiMallActListInPage(ApiMallActListDto apiMallActListDto) {
@@ -128,7 +136,7 @@
BigDecimal prizeScore = wallet.getPrizeScore();
Integer actScoreCnt = mallActSet.getActScoreCnt();
if(prizeScore.compareTo(new BigDecimal(actScoreCnt))<0){
- throw new FebsException("竞猜积分不足");
+ throw new FebsException("积分不足");
}
/**
* 中奖概率 20%
@@ -142,8 +150,8 @@
DataDictionaryCustom cashDic = dataDictionaryCustomMapper.selectDicDataByTypeAndCode(
DataDictionaryEnum.WIN_CASH.getType(),
DataDictionaryEnum.WIN_CASH.getCode());
- String scoreDicValue = scoreDic.getValue();
- String cashDicValue = cashDic.getValue();
+ String scoreDicValue = scoreDic.getValue() == null? "0":scoreDic.getValue();
+ String cashDicValue = cashDic.getValue() == null? "0":cashDic.getValue();
BigDecimal totalProbability = new BigDecimal(scoreDicValue).add(new BigDecimal(cashDicValue));
//获取那个更大一点的几率
BigDecimal maxProbability = BigDecimal.ZERO;
@@ -180,9 +188,11 @@
if(CollUtil.isNotEmpty(mallActAwardSetXXCY)){
apiMallAwardDetailsVo.setAwardImage(mallActAwardSetXXCY.get(0).getAwardImage());
apiMallAwardDetailsVo.setAwardName(mallActAwardSetXXCY.get(0).getAwardName());
+ apiMallAwardDetailsVo.setAwardId(mallActAwardSetXXCY.get(0).getId());
}else{
apiMallAwardDetailsVo.setAwardName("未中奖");
}
+ apiMallAwardDetailsVo.setAwardType(MallActAwardSet.AWARD_TYPE_XXCY);
}else if(new BigDecimal(randomInt).compareTo(failureScope) > 0
&& new BigDecimal(randomInt).compareTo(failureScope.add(maxProbability.multiply(new BigDecimal(100)))) <= 0){
//大于failureScope.add(maxProbability.multiply(new BigDecimal(100)))这个数字，则中奖
@@ -214,9 +224,11 @@
if(CollUtil.isNotEmpty(mallActAwardSetXXCY)){
apiMallAwardDetailsVo.setAwardImage(mallActAwardSetXXCY.get(0).getAwardImage());
apiMallAwardDetailsVo.setAwardName(mallActAwardSetXXCY.get(0).getAwardName());
+ apiMallAwardDetailsVo.setAwardId(mallActAwardSetXXCY.get(0).getId());
}else{
apiMallAwardDetailsVo.setAwardName("未中奖");
}
+ apiMallAwardDetailsVo.setAwardType(MallActAwardSet.AWARD_TYPE_XXCY);
}else{
List<MallActAwardSet> idList = new ArrayList();
for(MallActAwardSet mallActAwardSet : mallActAwardSets){
@@ -259,6 +271,7 @@
apiMallAwardDetailsVo.setAwardType(mallActAwardSet.getAwardType());
apiMallAwardDetailsVo.setAwardValue(mallActAwardSet.getAwardValue());
apiMallAwardDetailsVo.setAwardImage(mallActAwardSet.getAwardImage());
+ apiMallAwardDetailsVo.setAwardId(mallActAwardSet.getId());
if(MallActAwardSet.AWARD_TYPE_JF == mallActAwardSet.getAwardType()){
prizeScore = prizeScore.add(new BigDecimal(mallActAwardSet.getAwardValue()));
@@ -280,9 +293,11 @@
if(CollUtil.isNotEmpty(mallActAwardSetXXCY)){
apiMallAwardDetailsVo.setAwardImage(mallActAwardSetXXCY.get(0).getAwardImage());
apiMallAwardDetailsVo.setAwardName(mallActAwardSetXXCY.get(0).getAwardName());
+ apiMallAwardDetailsVo.setAwardId(mallActAwardSetXXCY.get(0).getId());
}else{
apiMallAwardDetailsVo.setAwardName("未中奖");
}
+ apiMallAwardDetailsVo.setAwardType(MallActAwardSet.AWARD_TYPE_XXCY);
}
}else{
//获取活动下该类别的奖品
@@ -301,9 +316,11 @@
if(CollUtil.isNotEmpty(mallActAwardSetXXCY)){
apiMallAwardDetailsVo.setAwardImage(mallActAwardSetXXCY.get(0).getAwardImage());
apiMallAwardDetailsVo.setAwardName(mallActAwardSetXXCY.get(0).getAwardName());
+ apiMallAwardDetailsVo.setAwardId(mallActAwardSetXXCY.get(0).getId());
}else{
apiMallAwardDetailsVo.setAwardName("未中奖");
}
+ apiMallAwardDetailsVo.setAwardType(MallActAwardSet.AWARD_TYPE_XXCY);
}else{
List<MallActAwardSet> idList = new ArrayList();
for(MallActAwardSet mallActAwardSet : mallActAwardSets){
@@ -346,6 +363,7 @@
apiMallAwardDetailsVo.setAwardType(mallActAwardSet.getAwardType());
apiMallAwardDetailsVo.setAwardValue(mallActAwardSet.getAwardValue());
apiMallAwardDetailsVo.setAwardImage(mallActAwardSet.getAwardImage());
+ apiMallAwardDetailsVo.setAwardId(mallActAwardSet.getId());
if(MallActAwardSet.AWARD_TYPE_JF == mallActAwardSet.getAwardType()){
prizeScore = prizeScore.add(new BigDecimal(mallActAwardSet.getAwardValue()));
@@ -384,9 +402,11 @@
if(CollUtil.isNotEmpty(mallActAwardSetXXCY)){
apiMallAwardDetailsVo.setAwardImage(mallActAwardSetXXCY.get(0).getAwardImage());
apiMallAwardDetailsVo.setAwardName(mallActAwardSetXXCY.get(0).getAwardName());
+ apiMallAwardDetailsVo.setAwardId(mallActAwardSetXXCY.get(0).getId());
}else{
apiMallAwardDetailsVo.setAwardName("未中奖");
}
+ apiMallAwardDetailsVo.setAwardType(MallActAwardSet.AWARD_TYPE_XXCY);
}else{
List<MallActAwardSet> idList = new ArrayList();
for(MallActAwardSet mallActAwardSet : mallActAwardSets){
@@ -429,6 +449,7 @@
apiMallAwardDetailsVo.setAwardType(mallActAwardSet.getAwardType());
apiMallAwardDetailsVo.setAwardValue(mallActAwardSet.getAwardValue());
apiMallAwardDetailsVo.setAwardImage(mallActAwardSet.getAwardImage());
+ apiMallAwardDetailsVo.setAwardId(mallActAwardSet.getId());
if(MallActAwardSet.AWARD_TYPE_JF == mallActAwardSet.getAwardType()){
prizeScore = prizeScore.add(new BigDecimal(mallActAwardSet.getAwardValue()));
@@ -450,9 +471,11 @@
if(CollUtil.isNotEmpty(mallActAwardSetXXCY)){
apiMallAwardDetailsVo.setAwardImage(mallActAwardSetXXCY.get(0).getAwardImage());
apiMallAwardDetailsVo.setAwardName(mallActAwardSetXXCY.get(0).getAwardName());
+ apiMallAwardDetailsVo.setAwardId(mallActAwardSetXXCY.get(0).getId());
}else{
apiMallAwardDetailsVo.setAwardName("未中奖");
}
+ apiMallAwardDetailsVo.setAwardType(MallActAwardSet.AWARD_TYPE_XXCY);
}
}else{
//获取活动下该类别的奖品
@@ -471,9 +494,11 @@
if(CollUtil.isNotEmpty(mallActAwardSetXXCY)){
apiMallAwardDetailsVo.setAwardImage(mallActAwardSetXXCY.get(0).getAwardImage());
apiMallAwardDetailsVo.setAwardName(mallActAwardSetXXCY.get(0).getAwardName());
+ apiMallAwardDetailsVo.setAwardId(mallActAwardSetXXCY.get(0).getId());
}else{
apiMallAwardDetailsVo.setAwardName("未中奖");
}
+ apiMallAwardDetailsVo.setAwardType(MallActAwardSet.AWARD_TYPE_XXCY);
}else{
List<MallActAwardSet> idList = new ArrayList();
for(MallActAwardSet mallActAwardSet : mallActAwardSets){
@@ -516,6 +541,7 @@
apiMallAwardDetailsVo.setAwardType(mallActAwardSet.getAwardType());
apiMallAwardDetailsVo.setAwardValue(mallActAwardSet.getAwardValue());
apiMallAwardDetailsVo.setAwardImage(mallActAwardSet.getAwardImage());
+ apiMallAwardDetailsVo.setAwardId(mallActAwardSet.getId());
if(MallActAwardSet.AWARD_TYPE_JF == mallActAwardSet.getAwardType()){
prizeScore = prizeScore.add(new BigDecimal(mallActAwardSet.getAwardValue()));
@@ -527,11 +553,50 @@
}
//扣竞猜积分
- prizeScore = prizeScore.subtract(new BigDecimal(actScoreCnt));
- wallet.setPrizeScore(prizeScore);
- wallet.setCommission(commission);
- mallMemberWalletMapper.updateAmountWithVersion(wallet);
+// prizeScore = prizeScore.subtract(new BigDecimal(actScoreCnt));
+// wallet.setPrizeScore(prizeScore);
+// wallet.setCommission(commission);
+// mallMemberWalletMapper.updateAmountWithVersion(wallet);
+ // 消耗积分
+ BigDecimal useScore = new BigDecimal(actScoreCnt);
+ mallMemberWalletService.reduce(useScore, wallet.getMemberId(), "prizeScore");
+ mallMoneyFlowService.addMoneyFlow(
+ wallet.getMemberId(),
+ useScore.negate(),
+ ScoreFlowTypeEnum.LUCKY_DRAW.getValue(),
+ MallUtils.getOrderNum(),
+ FlowTypeEnum.PRIZE_SCORE.getValue(),
+ StrUtil.format(ScoreFlowTypeEnum.LUCKY_DRAW.getDesc(),useScore),
+ 2
+ );
+
+ if (apiMallAwardDetailsVo.getAwardType() != 3) {
+ BigDecimal prize = new BigDecimal(apiMallAwardDetailsVo.getAwardValue());
+ if (apiMallAwardDetailsVo.getAwardType() == 1) {
+ mallMemberWalletService.add(prize, wallet.getMemberId(), "prizeScore");
+ mallMoneyFlowService.addMoneyFlow(
+ wallet.getMemberId(),
+ prize,
+ ScoreFlowTypeEnum.LUCKY_DRAW.getValue(),
+ MallUtils.getOrderNum(),
+ FlowTypeEnum.PRIZE_SCORE.getValue(),
+ StrUtil.format(ScoreFlowTypeEnum.LUCKY_DRAW.getDesc(),prize),
+ 2
+ );
+ } else if (apiMallAwardDetailsVo.getAwardType() == 2) {
+ mallMemberWalletService.add(prize, wallet.getMemberId(), "commission");
+ mallMoneyFlowService.addMoneyFlow(
+ wallet.getMemberId(),
+ prize,
+ ScoreFlowTypeEnum.LUCKY_DRAW_COMMISSION.getValue(),
+ MallUtils.getOrderNum(),
+ FlowTypeEnum.COMMISSION.getValue(),
+ StrUtil.format(ScoreFlowTypeEnum.LUCKY_DRAW_COMMISSION.getDesc(),prize),
+ 2
+ );
+ }
+ }
return apiMallAwardDetailsVo;
}
--
Gitblit v1.9.1