From 6539b325b5ce95d1fafa864c75a32279c954167f Mon Sep 17 00:00:00 2001 From: KKSU <15274802129@163.com> Date: Fri, 07 Feb 2025 11:03:31 +0800 Subject: [PATCH] refactor(mall): 重构订单退款流程 --- src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallActServiceImpl.java | 135 ++++++++++++++++++++++++++++++++------------- 1 files changed, 96 insertions(+), 39 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 47ba08a..0113b5d 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,16 +1,27 @@ package cc.mrbird.febs.mall.service.impl; +import cc.mrbird.febs.common.entity.FebsResponse; 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.conversion.MallActivityConversion; +import cc.mrbird.febs.mall.conversion.MallGoodsCouponConversion; 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; +import cn.hutool.core.date.DateUtil; +import cn.hutool.core.util.IdUtil; +import cn.hutool.core.util.ObjectUtil; +import cn.hutool.core.util.RandomUtil; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; @@ -34,6 +45,11 @@ private final MallActLuckdrawRecordMapper mallActLuckdrawRecordMapper; private final MallMemberWalletMapper mallMemberWalletMapper; private final DataDictionaryCustomMapper dataDictionaryCustomMapper; + private final IMallMoneyFlowService mallMoneyFlowService; + private final IApiMallMemberWalletService mallMemberWalletService; + private final MallActivityMapper mallActivityMapper; + private final MallGoodsCouponMapper mallGoodsCouponMapper; + private final MallMemberCouponMapper mallMemberCouponMapper; @Override public IPage<ApiMallActListVo> findApiMallActListInPage(ApiMallActListDto apiMallActListDto) { @@ -42,38 +58,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 @@ -142,8 +130,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; @@ -184,6 +172,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)))这个数字,则中奖 @@ -219,6 +208,7 @@ }else{ apiMallAwardDetailsVo.setAwardName("未中奖"); } + apiMallAwardDetailsVo.setAwardType(MallActAwardSet.AWARD_TYPE_XXCY); }else{ List<MallActAwardSet> idList = new ArrayList(); for(MallActAwardSet mallActAwardSet : mallActAwardSets){ @@ -287,6 +277,7 @@ }else{ apiMallAwardDetailsVo.setAwardName("未中奖"); } + apiMallAwardDetailsVo.setAwardType(MallActAwardSet.AWARD_TYPE_XXCY); } }else{ //获取活动下该类别的奖品 @@ -309,6 +300,7 @@ }else{ apiMallAwardDetailsVo.setAwardName("未中奖"); } + apiMallAwardDetailsVo.setAwardType(MallActAwardSet.AWARD_TYPE_XXCY); }else{ List<MallActAwardSet> idList = new ArrayList(); for(MallActAwardSet mallActAwardSet : mallActAwardSets){ @@ -394,6 +386,7 @@ }else{ apiMallAwardDetailsVo.setAwardName("未中奖"); } + apiMallAwardDetailsVo.setAwardType(MallActAwardSet.AWARD_TYPE_XXCY); }else{ List<MallActAwardSet> idList = new ArrayList(); for(MallActAwardSet mallActAwardSet : mallActAwardSets){ @@ -462,6 +455,7 @@ }else{ apiMallAwardDetailsVo.setAwardName("未中奖"); } + apiMallAwardDetailsVo.setAwardType(MallActAwardSet.AWARD_TYPE_XXCY); } }else{ //获取活动下该类别的奖品 @@ -484,6 +478,7 @@ }else{ apiMallAwardDetailsVo.setAwardName("未中奖"); } + apiMallAwardDetailsVo.setAwardType(MallActAwardSet.AWARD_TYPE_XXCY); }else{ List<MallActAwardSet> idList = new ArrayList(); for(MallActAwardSet mallActAwardSet : mallActAwardSets){ @@ -538,13 +533,75 @@ } //扣竞猜积分 - 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; } + @Override + public ApiCouponVo findApiCouponById(Long id) { + Long memberId = LoginUserUtil.getLoginUser().getId(); + + MallGoodsCoupon mallGoodsCoupon = mallGoodsCouponMapper.selectById(id); + ApiCouponVo apiCouponVo = MallGoodsCouponConversion.INSTANCE.entityToApiCouponVo(mallGoodsCoupon); + List<MallMemberCoupon> mallMemberCoupons = mallMemberCouponMapper.selectList( + new LambdaQueryWrapper<MallMemberCoupon>() + .eq(MallMemberCoupon::getMemberId, memberId) + .eq(MallMemberCoupon::getCouponId, id) + ); + if(CollUtil.isNotEmpty(mallMemberCoupons)){ + apiCouponVo.setState(1); + }else{ + apiCouponVo.setState(0); + } + return apiCouponVo; + } + + @Override + public FebsResponse addCoupon(Long couponId) { + Long memberId = LoginUserUtil.getLoginUser().getId(); + MallGoodsCoupon mallGoodsCoupon = mallGoodsCouponMapper.selectById(couponId); + if(mallGoodsCoupon.getState() == 2){ + List<MallMemberCoupon> mallMemberCoupons = mallMemberCouponMapper.selectList( + new LambdaQueryWrapper<MallMemberCoupon>() + .eq(MallMemberCoupon::getMemberId, memberId) + .eq(MallMemberCoupon::getCouponId, couponId) + ); + if(CollUtil.isNotEmpty(mallMemberCoupons)){ + return new FebsResponse().fail().message("优惠卷已领取,请刷新当前页面"); + } + + MallMemberCoupon memberCoupon = new MallMemberCoupon(); + memberCoupon.setMemberId(memberId); + memberCoupon.setCouponId(couponId); + memberCoupon.setCouponName(mallGoodsCoupon.getName()); + memberCoupon.setCouponUuid(IdUtil.simpleUUID()); + memberCoupon.setState(1); + memberCoupon.setFromType(1); + memberCoupon.setExpireTime(DateUtil.offsetDay(DateUtil.date(), mallGoodsCoupon.getExpireDay())); + mallMemberCouponMapper.insert(memberCoupon); + return new FebsResponse().success().message("操作成功"); + } + return new FebsResponse().fail().message("优惠卷已失效,请刷新当前页面"); + } + } -- Gitblit v1.9.1