匹配

KKSU

2023-11-24 1c59b84d5320fba3c450d932f24a9fdc52830420

 src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallMemberServiceImpl.java

@@ -15,6 +15,8 @@
import cc.mrbird.febs.mall.vo.*;
import cn.hutool.core.bean.BeanUtil;
import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.date.DateTime;
import cn.hutool.core.date.DateUtil;
import cn.hutool.core.util.IdUtil;
import cn.hutool.core.util.ObjectUtil;
import cn.hutool.core.util.StrUtil;
@@ -249,6 +251,18 @@
        mallMemberVo.setFcmCntFrozen(mallMemberAmount.getFcmCntFrozen());
        mallMemberVo.setTokenAva(mallMemberAmount.getTokenAva());
        mallMemberVo.setTokenFrozen(mallMemberAmount.getTokenFrozen());
        DataDictionaryCustom startTimeDic = dataDictionaryCustomMapper.selectDicDataByTypeAndCode(
                DataDictionaryEnum.YU_YUE_START_TIME.getType(),
                DataDictionaryEnum.YU_YUE_START_TIME.getCode()
        );
        DateTime startTime = cn.hutool.core.date.DateUtil.parseTime(startTimeDic.getValue());
        mallMemberVo.setStartTime(startTime);
        DataDictionaryCustom endTimeDic = dataDictionaryCustomMapper.selectDicDataByTypeAndCode(
                DataDictionaryEnum.YU_YUE_END_TIME.getType(),
                DataDictionaryEnum.YU_YUE_END_TIME.getCode()
        );
        DateTime endTime = DateUtil.parseTime(endTimeDic.getValue());
        mallMemberVo.setEndTime(endTime);
        return new FebsResponse().success().data(mallMemberVo);
    }

@@ -758,7 +772,7 @@
        Long unfreezeMemberId = unfreezeDto.getMemberId();
        MallMember mallMember = this.baseMapper.selectById(unfreezeMemberId);
        Integer isFrozen = mallMember.getIsFrozen();
        if(1 != isFrozen){
        if(ProductEnum.MEMBER_UNFROZEN.getValue() == isFrozen){
            throw new FebsException("账户未被冻结");
        }
        DataDictionaryCustom memberFrozenFcmCntDic = dataDictionaryCustomMapper.selectDicDataByTypeAndCode(
@@ -781,7 +795,7 @@
        BigDecimal fcmCntAvaSub = fcmCntAva.subtract(memberFrozenFcmCnt);
        mallMemberAmount.setFcmCntAva(fcmCntAvaSub);
        mallMemberAmountMapper.updateById(mallMemberAmount);
        mallMember.setIsFrozen(0);
        mallMember.setIsFrozen(ProductEnum.MEMBER_UNFROZEN.getValue());
        this.baseMapper.updateById(mallMember);

        mallMoneyFlowService.addMoneyFlow(