xiaoyong931011
2023-04-08 cc30aa0884535c6e08844e3b6b0dfadbc7d86d35
在mq之前,先更新订单状态
1 files deleted
4 files modified
1 files added
259 ■■■■■ changed files
src/main/java/cc/mrbird/febs/common/enumerates/PerkEnum.java 8 ●●●●● patch | view | raw | blame | history
src/main/java/cc/mrbird/febs/mall/controller/AdminSystemController.java 26 ●●●●● patch | view | raw | blame | history
src/main/java/cc/mrbird/febs/mall/controller/ViewSystemController.java 12 ●●●●● patch | view | raw | blame | history
src/main/java/cc/mrbird/febs/mall/vo/AdminPoolSetVo.java 10 ●●●●● patch | view | raw | blame | history
src/main/resources/templates/febs/views/modules/system/poolSet.html 111 ●●●●● patch | view | raw | blame | history
src/main/resources/templates/febs/views/modules/system/poorSet.html 92 ●●●●● patch | view | raw | blame | history
src/main/java/cc/mrbird/febs/common/enumerates/PerkEnum.java
@@ -12,10 +12,18 @@
     */
    POOL_SCORE_PRICE("PERK_SET", "POOL_SCORE_PRICE"),
    /**
     * 套餐进去积分池积分比例
     */
    POOL_SCORE_PERCENT("PERK_SET", "POOL_SCORE_PERCENT"),
    /**
     * 积分池积分
     */
    POOL_SCORE("PERK_SET", "POOL_SCORE"),
    /**
     * 套餐进去积分池现金比例
     */
    POOL_CASH_PERCENT("PERK_SET", "POOL_CASH_PERCENT"),
    /**
     * 积分池现金
     */
    POOL_CASH("PERK_SET", "POOL_CASH"),
src/main/java/cc/mrbird/febs/mall/controller/AdminSystemController.java
@@ -8,6 +8,7 @@
import cc.mrbird.febs.mall.service.ICommonService;
import cc.mrbird.febs.mall.service.ISystemService;
import cc.mrbird.febs.mall.vo.AdminPerkSetVo;
import cc.mrbird.febs.mall.vo.AdminPoolSetVo;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
@@ -73,4 +74,29 @@
                adminPerkSetVo.getPartnerCashPerkPercent());
        return new FebsResponse().success();
    }
    @PostMapping(value = "/poolSet")
    public FebsResponse poolSet(AdminPoolSetVo adminPoolSetVo) {
        commonService.updateDataDic(
                PerkEnum.POOL_CASH.getType(),
                PerkEnum.POOL_CASH.getCode(),
                adminPoolSetVo.getPoolCash());
        commonService.updateDataDic(
                PerkEnum.POOL_CASH_PERCENT.getType(),
                PerkEnum.POOL_CASH_PERCENT.getCode(),
                adminPoolSetVo.getPoolCashPercent());
        commonService.updateDataDic(
                PerkEnum.POOL_SCORE.getType(),
                PerkEnum.POOL_SCORE.getCode(),
                adminPoolSetVo.getPoolScore());
        commonService.updateDataDic(
                PerkEnum.POOL_SCORE_PERCENT.getType(),
                PerkEnum.POOL_SCORE_PERCENT.getCode(),
                adminPoolSetVo.getPoolScorePercent());
        commonService.updateDataDic(
                PerkEnum.POOL_SCORE_PRICE.getType(),
                PerkEnum.POOL_SCORE_PRICE.getCode(),
                adminPoolSetVo.getPoolScorePrice());
        return new FebsResponse().success();
    }
}
src/main/java/cc/mrbird/febs/mall/controller/ViewSystemController.java
@@ -185,6 +185,18 @@
        if (poolScorePriceDic != null) {
            adminPoolSetVo.setPoolScorePrice(poolScorePriceDic.getValue());
        }
        DataDictionaryCustom poolCashPercentDic = dataDictionaryCustomMapper.selectDicDataByTypeAndCode(
                PerkEnum.POOL_CASH_PERCENT.getType(),
                PerkEnum.POOL_CASH_PERCENT.getCode());
        if (poolCashPercentDic != null) {
            adminPoolSetVo.setPoolCashPercent(poolCashPercentDic.getValue());
        }
        DataDictionaryCustom poolScorePercentDic = dataDictionaryCustomMapper.selectDicDataByTypeAndCode(
                PerkEnum.POOL_SCORE_PERCENT.getType(),
                PerkEnum.POOL_SCORE_PERCENT.getCode());
        if (poolScorePercentDic != null) {
            adminPoolSetVo.setPoolScorePercent(poolScorePercentDic.getValue());
        }
        model.addAttribute("adminPoolSet", adminPoolSetVo);
        return FebsUtil.view("modules/system/poolSet");
src/main/java/cc/mrbird/febs/mall/vo/AdminPoolSetVo.java
@@ -22,4 +22,14 @@
     * POOL_SCORE_PRICE
     */
    private String poolScorePrice;
    /**
     * 套餐进去积分池现金比例
     */
    private String poolCashPercent;
    /**
     * 套餐进去积分池积分比例
     */
    private String poolScorePercent;
}
src/main/resources/templates/febs/views/modules/system/poolSet.html
New file
@@ -0,0 +1,111 @@
<div class="layui-fluid layui-anim febs-anim" id="pool-set" lay-title="积分池设置">
    <div class="layui-row layui-col-space8 febs-container">
        <form class="layui-form" action="" lay-filter="pool-set-form">
            <div class="layui-card">
                <div class="layui-card-body">
                    <blockquote class="layui-elem-quote blue-border">积分池</blockquote>
                    <div class="layui-form-item">
                        <div class="layui-inline">
                            <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="poolCash" lay-verify="required" placeholder="请输入数字" autocomplete="off" class="layui-input">
                            </div>
                        </div>
                    </div>
                    <div class="layui-form-item">
                        <div class="layui-inline">
                            <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="poolScore" lay-verify="required" placeholder="请输入数字" autocomplete="off" class="layui-input">
                            </div>
                        </div>
                    </div>
                    <div class="layui-form-item">
                        <div class="layui-inline">
                            <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="poolScorePrice" lay-verify="required" placeholder="请输入数字" autocomplete="off" class="layui-input">
                            </div>
                        </div>
                    </div>
                    <blockquote class="layui-elem-quote blue-border">积分池比例设置</blockquote>
                    <div class="layui-form-item">
                        <div class="layui-inline">
                            <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="poolCashPercent" lay-verify="required" placeholder="请输入数字" autocomplete="off" class="layui-input">
                            </div>
                            <div class="layui-form-mid layui-word-aux">%,进入积分池。</div>
                        </div>
                    </div>
                    <div class="layui-form-item">
                        <div class="layui-inline">
                            <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="poolScorePercent" lay-verify="required" placeholder="请输入数字" autocomplete="off" class="layui-input">
                            </div>
                            <div class="layui-form-mid layui-word-aux">%,进入积分池。</div>
                        </div>
                    </div>
                </div>
                <div class="layui-card-footer">
                    <button class="layui-btn layui-btn-normal" lay-submit="" lay-filter="pool-set-form-submit" id="submit">保存</button>
                </div>
            </div>
        </form>
    </div>
</div>
<style>
    .layui-form-label {
        width: 120px;
    }
    .layui-form-item .layui-input-block {
        margin-left: 150px;
    }
    .layui-table-form .layui-form-item {
        margin-bottom: 20px !important;
    }
</style>
<script data-th-inline="javascript" type="text/javascript">
    layui.use(['dropdown', 'jquery', 'validate', 'febs', 'form', 'eleTree'], function () {
        var $ = layui.jquery,
            febs = layui.febs,
            form = layui.form,
            adminPoolSet = [[${adminPoolSet}]],
            validate = layui.validate,
            $view = $('#pool-set');
        form.verify(validate);
        initPoolSetValue();
        form.render();
        function initPoolSetValue() {
            form.val("pool-set-form", {
                "poolCash": adminPoolSet.poolCash,
                "poolScore": adminPoolSet.poolScore,
                "poolScorePrice": adminPoolSet.poolScorePrice,
                "poolCashPercent": adminPoolSet.poolCashPercent,
                "poolScorePercent": adminPoolSet.poolScorePercent
            });
        }
        form.on('submit(pool-set-form-submit)', function (data) {
            console.log(data);
            febs.post(ctx + 'admin/system/poolSet', data.field, function (res) {
                febs.alert.success('设置成功');
            });
            window.location.reload();
            return false;
        });
    });
</script>
src/main/resources/templates/febs/views/modules/system/poorSet.html
File was deleted