From 2efdb9596b737ec240ec1aca6b6ad85e2314981d Mon Sep 17 00:00:00 2001
From: KKSU <15274802129@163.com>
Date: Wed, 08 Jan 2025 15:00:57 +0800
Subject: [PATCH] feat(quartz): 优化活动状态定时任务
---
src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallActServiceImpl.java | 67 +++++++++++++++------------------
1 files changed, 31 insertions(+), 36 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 6dc0050..4e54820 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
@@ -5,6 +5,7 @@
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.conversion.MallActivityConversion;
import cc.mrbird.febs.mall.dto.ApiMallActListDto;
import cc.mrbird.febs.mall.dto.ApiMallActWinDetailsDto;
import cc.mrbird.febs.mall.entity.*;
@@ -12,9 +13,13 @@
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 cc.mrbird.febs.mall.vo.ApiActivityVo;
+import cc.mrbird.febs.mall.vo.ApiMallActListVo;
+import cc.mrbird.febs.mall.vo.ApiMallActWinDetailsVo;
+import cc.mrbird.febs.mall.vo.ApiMallAwardDetailsVo;
import cn.hutool.core.collection.CollUtil;
+import cn.hutool.core.util.ObjectUtil;
+import cn.hutool.core.util.RandomUtil;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@@ -40,6 +45,7 @@
private final DataDictionaryCustomMapper dataDictionaryCustomMapper;
private final IMallMoneyFlowService mallMoneyFlowService;
private final IApiMallMemberWalletService mallMemberWalletService;
+ private final MallActivityMapper mallActivityMapper;
@Override
public IPage<ApiMallActListVo> findApiMallActListInPage(ApiMallActListDto apiMallActListDto) {
@@ -48,38 +54,10 @@
}
@Override
- public ApiMallActDetailsVo findApiMallActDetailsById(Long id) {
- MallActSet mallActSet = this.baseMapper.selectById(id);
- if(ObjectUtil.isEmpty(mallActSet)){
- throw new FebsException("活动不存在");
- }
- ApiMallActDetailsVo apiMallActDetailsVo = new ApiMallActDetailsVo();
- apiMallActDetailsVo.setId(mallActSet.getId());
- apiMallActDetailsVo.setActName(mallActSet.getActName());
- apiMallActDetailsVo.setActCode(mallActSet.getActCode());
- apiMallActDetailsVo.setActImage(mallActSet.getActImage());
- apiMallActDetailsVo.setActStartTime(mallActSet.getActStartTime());
- apiMallActDetailsVo.setActEndTime(mallActSet.getActEndTime());
- apiMallActDetailsVo.setActScoreCnt(mallActSet.getActScoreCnt());
- apiMallActDetailsVo.setActRemark(mallActSet.getActRemark());
-
- List<MallActAwardSet> mallActAwardSets = mallActAwardSetMapper.selectMallActAwardByActId(id);
- if(CollUtil.isNotEmpty(mallActAwardSets)){
- List<ApiMallActAwardListDto> apiMallActAwardListDtos = new ArrayList<>();
- for(MallActAwardSet mallActAwardSet : mallActAwardSets){
- ApiMallActAwardListDto apiMallActAwardListDto = new ApiMallActAwardListDto();
- apiMallActAwardListDto.setId(mallActAwardSet.getId());
- apiMallActAwardListDto.setAwardName(mallActAwardSet.getAwardName());
- apiMallActAwardListDto.setAwardImage(mallActAwardSet.getAwardImage());
- apiMallActAwardListDto.setAwardTotal(mallActAwardSet.getAwardTotal());
- apiMallActAwardListDto.setAwardCnt(mallActAwardSet.getAwardCnt());
- apiMallActAwardListDto.setAwardType(mallActAwardSet.getAwardType());
- apiMallActAwardListDto.setAwardValue(mallActAwardSet.getAwardValue());
- apiMallActAwardListDtos.add(apiMallActAwardListDto);
- }
- apiMallActDetailsVo.setApiMallActAwardListDtos(apiMallActAwardListDtos);
- }
- return apiMallActDetailsVo;
+ public ApiActivityVo findApiMallActDetailsById(Long id) {
+ MallActivity mallActivity = mallActivityMapper.selectById(id);
+ ApiActivityVo apiActivityVo = MallActivityConversion.INSTANCE.entityToApiActivityVo(mallActivity);
+ return apiActivityVo;
}
@Override
@@ -190,6 +168,7 @@
}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)))这个数字，则中奖
@@ -225,6 +204,7 @@
}else{
apiMallAwardDetailsVo.setAwardName("未中奖");
}
+ apiMallAwardDetailsVo.setAwardType(MallActAwardSet.AWARD_TYPE_XXCY);
}else{
List<MallActAwardSet> idList = new ArrayList();
for(MallActAwardSet mallActAwardSet : mallActAwardSets){
@@ -293,6 +273,7 @@
}else{
apiMallAwardDetailsVo.setAwardName("未中奖");
}
+ apiMallAwardDetailsVo.setAwardType(MallActAwardSet.AWARD_TYPE_XXCY);
}
}else{
//获取活动下该类别的奖品
@@ -315,6 +296,7 @@
}else{
apiMallAwardDetailsVo.setAwardName("未中奖");
}
+ apiMallAwardDetailsVo.setAwardType(MallActAwardSet.AWARD_TYPE_XXCY);
}else{
List<MallActAwardSet> idList = new ArrayList();
for(MallActAwardSet mallActAwardSet : mallActAwardSets){
@@ -400,6 +382,7 @@
}else{
apiMallAwardDetailsVo.setAwardName("未中奖");
}
+ apiMallAwardDetailsVo.setAwardType(MallActAwardSet.AWARD_TYPE_XXCY);
}else{
List<MallActAwardSet> idList = new ArrayList();
for(MallActAwardSet mallActAwardSet : mallActAwardSets){
@@ -468,6 +451,7 @@
}else{
apiMallAwardDetailsVo.setAwardName("未中奖");
}
+ apiMallAwardDetailsVo.setAwardType(MallActAwardSet.AWARD_TYPE_XXCY);
}
}else{
//获取活动下该类别的奖品
@@ -490,6 +474,7 @@
}else{
apiMallAwardDetailsVo.setAwardName("未中奖");
}
+ apiMallAwardDetailsVo.setAwardType(MallActAwardSet.AWARD_TYPE_XXCY);
}else{
List<MallActAwardSet> idList = new ArrayList();
for(MallActAwardSet mallActAwardSet : mallActAwardSets){
@@ -549,11 +534,21 @@
// wallet.setCommission(commission);
// mallMemberWalletMapper.updateAmountWithVersion(wallet);
+ // 消耗积分
BigDecimal useScore = new BigDecimal(actScoreCnt);
mallMemberWalletService.reduce(useScore, wallet.getMemberId(), "prizeScore");
- mallMemberWalletService.add(commission, wallet.getMemberId(), "commission");
mallMoneyFlowService.addMoneyFlow(wallet.getMemberId(), useScore.negate(), MoneyFlowTypeEnum.PRIZE.getValue(), null, FlowTypeEnum.PRIZE_SCORE.getValue());
- mallMoneyFlowService.addMoneyFlow(wallet.getMemberId(), commission, MoneyFlowTypeEnum.PRIZE.getValue(), null, FlowTypeEnum.COMMISSION.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