blame | history | patch | commit | commitdiff | ignore whitespace
xiaoyong931011
2022-06-17 ffecf9785a3b3e8586854251e92ca4040f1279a5 
 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;


@@ -538,11 +544,16 @@


        }




        //扣竞猜积分


        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");


        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());


        return apiMallAwardDetailsVo;


    }