xiaoyong931011
2023-04-04 f394f97ac1a1216251e70678dee5484610c39178
关于积分凭证
3 files modified
26 ■■■■ changed files
src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallMemberServiceImpl.java 17 ●●●● patch | view | raw | blame | history
src/main/java/cc/mrbird/febs/mall/vo/CashOutSettingVo.java 6 ●●●●● patch | view | raw | blame | history
src/main/java/cc/mrbird/febs/mall/vo/MallMemberVo.java 3 ●●●●● patch | view | raw | blame | history
src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallMemberServiceImpl.java
@@ -1,10 +1,7 @@
package cc.mrbird.febs.mall.service.impl;
import cc.mrbird.febs.common.entity.FebsResponse;
import cc.mrbird.febs.common.enumerates.AgentLevelEnum;
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.enumerates.*;
import cc.mrbird.febs.common.exception.FebsException;
import cc.mrbird.febs.common.utils.*;
import cc.mrbird.febs.mall.conversion.MallGoodsConversion;
@@ -252,6 +249,7 @@
        mallMemberVo.setPrizeScore(wallet.getPrizeScore());
        mallMemberVo.setTotalScore(wallet.getTotalScore());
        mallMemberVo.setStar(wallet.getStar());
        mallMemberVo.setVoucherCnt(wallet.getVoucherCnt());
        mallMemberVo.setTotalCost(mallOrderInfoMapper.selectTotalAmount(id));
        return new FebsResponse().success().data(mallMemberVo);
    }
@@ -559,6 +557,17 @@
        if (dic != null) {
            cashOutSettingVo = JSONObject.parseObject(dic.getValue(), CashOutSettingVo.class);
        }
        DataDictionaryCustom voucherOnOffDic = dataDictionaryCustomMapper.selectDicDataByTypeAndCode(
                GreenScoreEnum.VOUCHER_ON_OFF.getType(), GreenScoreEnum.VOUCHER_ON_OFF.getCode());
        if(ObjectUtil.isNotEmpty(voucherOnOffDic)){
            cashOutSettingVo.setVoucherOnOff(voucherOnOffDic.getValue());
            DataDictionaryCustom voucherPercentDic = dataDictionaryCustomMapper.selectDicDataByTypeAndCode(
                    GreenScoreEnum.VOUCHER_PERCENT.getType(), GreenScoreEnum.VOUCHER_PERCENT.getCode());
            if(ObjectUtil.isNotEmpty(voucherPercentDic)){
                cashOutSettingVo.setVoucherPercent(new BigDecimal(voucherPercentDic.getValue()));
            }
        }
        return cashOutSettingVo;
    }
src/main/java/cc/mrbird/febs/mall/vo/CashOutSettingVo.java
@@ -23,4 +23,10 @@
    @ApiModelProperty(value = "提现时间 1:工作日 2:每一天")
    private Integer workingDays;
    @ApiModelProperty(value = "绿色凭证提现开关 1:开启 2:关闭")
    private String voucherOnOff;
    @ApiModelProperty(value = "余额提现需要绿色凭证比例")
    private BigDecimal voucherPercent;
}
src/main/java/cc/mrbird/febs/mall/vo/MallMemberVo.java
@@ -90,4 +90,7 @@
    @ApiModelProperty(value = "贡献点")
    private Integer star;
    @ApiModelProperty(value = "凭证数量")
    private BigDecimal voucherCnt;
}