xiaoyong931011
2023-04-06 180d79f9a8972e028a43053dbab16f4a520f201e
关于积分凭证
6 files modified
47 ■■■■ changed files
src/main/java/cc/mrbird/febs/common/enumerates/GreenScoreEnum.java 4 ●●●● patch | view | raw | blame | history
src/main/java/cc/mrbird/febs/mall/controller/AdminSystemController.java 5 ●●●●● patch | view | raw | blame | history
src/main/java/cc/mrbird/febs/mall/controller/ViewSystemController.java 7 ●●●●● patch | view | raw | blame | history
src/main/java/cc/mrbird/febs/mall/dto/HlmVoucherSetDto.java 4 ●●●● patch | view | raw | blame | history
src/main/java/cc/mrbird/febs/mall/service/impl/MemberProfitServiceImpl.java 11 ●●●●● patch | view | raw | blame | history
src/main/resources/templates/febs/views/modules/system/hlmVoucherSet.html 16 ●●●● patch | view | raw | blame | history
src/main/java/cc/mrbird/febs/common/enumerates/GreenScoreEnum.java
@@ -8,6 +8,10 @@
@Getter
public enum GreenScoreEnum {
    /**
     * 每日业绩固定释放凭证数量
     */
    ACHIEVE_RELEASE("GREEN_SCORE", "ACHIEVE_RELEASE"),
    /**
     * 余额提现需要绿色凭证比例
     */
    VOUCHER_PERCENT("GREEN_SCORE", "VOUCHER_PERCENT"),
src/main/java/cc/mrbird/febs/mall/controller/AdminSystemController.java
@@ -132,6 +132,11 @@
                hlmVoucherSetDto.getAchieveReleasePercent());
        commonService.updateDataDic(
                GreenScoreEnum.ACHIEVE_RELEASE.getType(),
                GreenScoreEnum.ACHIEVE_RELEASE.getCode(),
                hlmVoucherSetDto.getAchieveRelease());
        commonService.updateDataDic(
                GreenScoreEnum.ACHIEVE_MAX.getType(),
                GreenScoreEnum.ACHIEVE_MAX.getCode(),
                hlmVoucherSetDto.getAchieveMax());
src/main/java/cc/mrbird/febs/mall/controller/ViewSystemController.java
@@ -256,6 +256,13 @@
            String achieveReleasePercent = ObjectUtil.isEmpty(achieveReleasePercentDic.getValue()) ? "0" : achieveReleasePercentDic.getValue();
            hlmVoucherSetDto.setAchieveReleasePercent(achieveReleasePercent);
        }
        DataDictionaryCustom achieveReleaseDic = dataDictionaryCustomMapper.selectDicDataByTypeAndCode(
                GreenScoreEnum.ACHIEVE_RELEASE.getType(),
                GreenScoreEnum.ACHIEVE_RELEASE.getCode());
        if (achieveReleaseDic != null) {
            String achieveRelease = ObjectUtil.isEmpty(achieveReleaseDic.getValue()) ? "0" : achieveReleaseDic.getValue();
            hlmVoucherSetDto.setAchieveRelease(achieveRelease);
        }
        DataDictionaryCustom achieveMaxDic = dataDictionaryCustomMapper.selectDicDataByTypeAndCode(
                GreenScoreEnum.ACHIEVE_MAX.getType(),
                GreenScoreEnum.ACHIEVE_MAX.getCode());
src/main/java/cc/mrbird/febs/mall/dto/HlmVoucherSetDto.java
@@ -46,5 +46,9 @@
     * 绿色凭证买卖池
     */
    private String scorePoolCnt;
    /**
     * 绿色凭证每日总释放积分凭证
     */
    private String achieveRelease;
}
src/main/java/cc/mrbird/febs/mall/service/impl/MemberProfitServiceImpl.java
@@ -866,8 +866,17 @@
        /**
         * 获取每日最大产生的凭证数量
         *      改成每日产出固定值
         */
        BigDecimal achieveDailyRelease = getAchieveDailyRelease();
//        BigDecimal achieveDailyRelease = getAchieveDailyRelease();
        DataDictionaryCustom achieveReleaseDic = dataDictionaryCustomMapper.selectDicDataByTypeAndCode(
                GreenScoreEnum.ACHIEVE_RELEASE.getType(),
                GreenScoreEnum.ACHIEVE_RELEASE.getCode()
        );
        BigDecimal achieveDailyRelease = new BigDecimal(achieveReleaseDic.getValue() == null ? "0" : achieveReleaseDic.getValue());
        if(achieveDailyRelease.compareTo(BigDecimal.ZERO) <= 0){
            return;
        }
        if(achieveTotal.compareTo(achieveMax) < 0){
            BigDecimal divide = achieveTotal.divide(achieveMax, 2, BigDecimal.ROUND_DOWN);
src/main/resources/templates/febs/views/modules/system/hlmVoucherSet.html
@@ -33,13 +33,20 @@
                    </div>
                    <blockquote class="layui-elem-quote blue-border">业绩产生积分凭证设置一</blockquote>
<!--                    <div class="layui-form-item">-->
<!--                        <label class="layui-form-label febs-form-item-require">比例:</label>-->
<!--                        <div class="layui-form-mid layui-word-aux">每日总释放积分凭证比例(万分之几):</div>-->
<!--                        <div class="layui-input-inline">-->
<!--                            <input type="text" name="achieveReleasePercent" lay-verify="required" placeholder="请输入数字" autocomplete="off" class="layui-input" >-->
<!--                        </div>-->
<!--                        <div class="layui-form-mid layui-word-aux">,例如:1,则表示总凭证数3000000*0.9*0.0001。</div>-->
<!--                    </div>-->
                    <div class="layui-form-item">
                        <label class="layui-form-label febs-form-item-require">比例:</label>
                        <div class="layui-form-mid layui-word-aux">每日总释放积分凭证比例(万分之几):</div>
                        <label class="layui-form-label febs-form-item-require">固定数量:</label>
                        <div class="layui-form-mid layui-word-aux">每日总释放积分凭证最大值:</div>
                        <div class="layui-input-inline">
                            <input type="text" name="achieveReleasePercent" lay-verify="required" placeholder="请输入数字" autocomplete="off" class="layui-input" >
                            <input type="text" name="achieveRelease" lay-verify="required" placeholder="请输入数字" autocomplete="off" class="layui-input" >
                        </div>
                        <div class="layui-form-mid layui-word-aux">,例如:1,则表示总凭证数3000000*0.9*0.0001。</div>
                    </div>
                    <div class="layui-form-item">
                        <label class="layui-form-label febs-form-item-require">规则一:</label>
@@ -133,6 +140,7 @@
                "totalCnt": hlmVoucherSet.totalCnt,
                "surplusCnt": hlmVoucherSet.surplusCnt,
                "scorePoolCnt": hlmVoucherSet.scorePoolCnt,
                "achieveRelease": hlmVoucherSet.achieveRelease,
                "roleReleasePercent": hlmVoucherSet.roleReleasePercent
            });
        }