Merge branch 'mall-amz' of http://120.27.238.55:7000/r/xc-mall into mall-amz

xiaoyong931011

2022-06-17 ffecf9785a3b3e8586854251e92ca4040f1279a5

Merge branch 'mall-amz' of http://120.27.238.55:7000/r/xc-mall into mall-amz

 src/main/java/cc/mrbird/febs/common/enumerates/MoneyFlowTypeEnum.java

@@ -83,7 +83,12 @@
    /**
     * 系统
     */
    SYSTEM(16);
    SYSTEM(16),

    /**
     * 抽奖
     */
    PRIZE(17);

    private final int value;


 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) {
@@ -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;
    }


 src/main/resources/templates/febs/views/modules/mallMember/moneyFlow.html

@@ -78,6 +78,8 @@
                                return '<span>感恩奖</span>'
                            }else if (d.type === 16) {
                                return '<span>系统拨付</span>'
                            }else if (d.type === 17) {
                                return '<span>抽奖</span>'
                            }else{
                                return ''
                            }

 src/main/resources/templates/febs/views/modules/mallMember/moneyFlowList.html

@@ -38,6 +38,7 @@
                                                <option value="14">竞猜积分签到</option>
                                                <option value="15">感恩奖</option>
                                                <option value="16">系统拨付</option>
                                                <option value="17">抽奖</option>
                                            </select>
                                        </div>
                                    </div>
@@ -153,6 +154,8 @@
                                return '<span>感恩奖</span>'
                            }else if (d.type === 16) {
                                return '<span>系统拨付</span>'
                            }else if (d.type === 17) {
                                return '<span>抽奖</span>'
                            }else{
                                return ''
                            }