From 48dcbb226d4d33c6ff02b7e68c1c591bcd88270e Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Fri, 24 Feb 2023 16:30:41 +0800
Subject: [PATCH] 后台订单显示修改
---
src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallActServiceImpl.java | 51 +++++++++++++++++++++++++++++++++++++++++++++------
1 files changed, 45 insertions(+), 6 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..137e07b 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,6 +1,8 @@
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.exception.FebsException;
import cc.mrbird.febs.common.utils.LoginUserUtil;
import cc.mrbird.febs.mall.dto.ApiMallActListDto;
@@ -8,6 +10,8 @@
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 +38,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) {
@@ -142,8 +148,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 +186,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 +222,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 +269,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 +291,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 +314,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 +361,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 +400,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 +447,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 +469,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 +492,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 +539,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 +551,26 @@
}
//扣竞猜积分
- 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(), MoneyFlowTypeEnum.PRIZE.getValue(), null, FlowTypeEnum.PRIZE_SCORE.getValue());
+
+ 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, MoneyFlowTypeEnum.PRIZE.getValue(), null, FlowTypeEnum.PRIZE_SCORE.getValue());
+ } else if (apiMallAwardDetailsVo.getAwardType() == 2) {
+ mallMemberWalletService.add(prize, wallet.getMemberId(), "commission");
+ mallMoneyFlowService.addMoneyFlow(wallet.getMemberId(), prize, MoneyFlowTypeEnum.PRIZE.getValue(), null, FlowTypeEnum.COMMISSION.getValue());
+ }
+ }
return apiMallAwardDetailsVo;
}
--
Gitblit v1.9.1