KKSU
2024-08-28 41c04c7de3211a2ee53f7e6e53653f8843c52e83
新增功能操作按钮,和更新了数据库数据
7 files modified
31 ■■■■■ changed files
src/main/java/cc/mrbird/febs/common/enumerates/DataDictionaryEnum.java 2 ●●●●● patch | view | raw | blame | history
src/main/java/cc/mrbird/febs/mall/controller/AdminNewsInfoController.java 4 ●●●● patch | view | raw | blame | history
src/main/java/cc/mrbird/febs/mall/controller/ViewNewsController.java 3 ●●●●● patch | view | raw | blame | history
src/main/java/cc/mrbird/febs/mall/dto/AdminGfaBasicSetDto.java 2 ●●●●● patch | view | raw | blame | history
src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallMemberServiceImpl.java 6 ●●●●● patch | view | raw | blame | history
src/main/java/cc/mrbird/febs/mall/vo/MallMemberVo.java 2 ●●●●● patch | view | raw | blame | history
src/main/resources/templates/febs/views/modules/news/gfaBasicSet.html 12 ●●●●● patch | view | raw | blame | history
src/main/java/cc/mrbird/febs/common/enumerates/DataDictionaryEnum.java
@@ -7,6 +7,8 @@
public enum DataDictionaryEnum {
    //FDH兑换标识 1-允许 0-拒绝
    COIN_CHANGE("COIN_CHANGE","COIN_CHANGE"),
    //FDH互转标识 1-允许 0-拒绝
    COIN_INSIDE_CHANGE("COIN_INSIDE_CHANGE","COIN_INSIDE_CHANGE"),
    //卡牌互转标识 1-允许 0-拒绝
    CARD_CHANGE("CARD_CHANGE","CARD_CHANGE"),
    //充值金额
src/main/java/cc/mrbird/febs/mall/controller/AdminNewsInfoController.java
@@ -255,6 +255,10 @@
                DataDictionaryEnum.COIN_CHANGE.getType(),
                DataDictionaryEnum.COIN_CHANGE.getCode(),
                gfaBasicSetDto.getChangeType());
        commonService.updateDataDic(
                DataDictionaryEnum.COIN_INSIDE_CHANGE.getType(),
                DataDictionaryEnum.COIN_INSIDE_CHANGE.getCode(),
                gfaBasicSetDto.getAroundInsideType());
        return new FebsResponse().success();
    }
src/main/java/cc/mrbird/febs/mall/controller/ViewNewsController.java
@@ -202,6 +202,9 @@
        gfaBasicSetDto.setChangeType(dataDictionaryCustomMapper.selectDicDataByTypeAndCode(
                DataDictionaryEnum.COIN_CHANGE.getType(),
                DataDictionaryEnum.COIN_CHANGE.getCode()).getValue());
        gfaBasicSetDto.setAroundInsideType(dataDictionaryCustomMapper.selectDicDataByTypeAndCode(
                DataDictionaryEnum.COIN_INSIDE_CHANGE.getType(),
                DataDictionaryEnum.COIN_INSIDE_CHANGE.getCode()).getValue());
        model.addAttribute("gfaBasicSet", gfaBasicSetDto);
        return FebsUtil.view("modules/news/gfaBasicSet");
src/main/java/cc/mrbird/febs/mall/dto/AdminGfaBasicSetDto.java
@@ -36,4 +36,6 @@
    //@ApiModelProperty(value = "FDH兑换标识 1-允许 0-拒绝")
    private String changeType;
    private String aroundInsideType;
}
src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallMemberServiceImpl.java
@@ -374,6 +374,12 @@
                DataDictionaryEnum.COIN_CHANGE.getCode()
        );
        mallMemberVo.setChangeType(Integer.parseInt(StrUtil.isEmpty(coinChangeDic.getValue()) ? "1" : coinChangeDic.getValue()));
        DataDictionaryCustom coinInsideChangeDic = dataDictionaryCustomMapper.selectDicDataByTypeAndCode(
                DataDictionaryEnum.COIN_INSIDE_CHANGE.getType(),
                DataDictionaryEnum.COIN_INSIDE_CHANGE.getCode()
        );
        mallMemberVo.setAroundCoinType(Integer.parseInt(StrUtil.isEmpty(coinInsideChangeDic.getValue()) ? "1" : coinInsideChangeDic.getValue()));
        return new FebsResponse().success().data(mallMemberVo);
    }
src/main/java/cc/mrbird/febs/mall/vo/MallMemberVo.java
@@ -126,6 +126,8 @@
    private BigDecimal usdtPrice;
    @ApiModelProperty(value = "卡牌互转标识 1-允许 0-拒绝")
    private Integer aroundType;
    @ApiModelProperty(value = "FDH互转标识 1-允许 0-拒绝")
    private Integer aroundCoinType;
    @ApiModelProperty(value = "FDH兑换标识 1-允许 0-拒绝")
    private Integer changeType;
src/main/resources/templates/febs/views/modules/news/gfaBasicSet.html
@@ -116,7 +116,7 @@
                    <blockquote class="layui-elem-quote blue-border">转账设置</blockquote>
                    <div class="layui-form-item">
                        <div class="layui-col-lg6">
                            <label class="layui-form-label febs-form-item-require">互转设置:</label>
                            <label class="layui-form-label febs-form-item-require">卡牌互转:</label>
                            <div class="layui-input-block">
                                <input type="text" name="aroundType" class="layui-input" >
                                <div class="layui-form-mid layui-word-aux">0-不允许 1-允许</div>
@@ -126,6 +126,15 @@
                            <label class="layui-form-label febs-form-item-require">FDH兑换:</label>
                            <div class="layui-input-block">
                                <input type="text" name="changeType" class="layui-input" >
                                <div class="layui-form-mid layui-word-aux">0-不允许 1-允许</div>
                            </div>
                        </div>
                    </div>
                    <div class="layui-form-item">
                        <div class="layui-col-lg6">
                            <label class="layui-form-label febs-form-item-require">FDH互转:</label>
                            <div class="layui-input-block">
                                <input type="text" name="aroundInsideType" class="layui-input" >
                                <div class="layui-form-mid layui-word-aux">0-不允许 1-允许</div>
                            </div>
                        </div>
@@ -188,6 +197,7 @@
                "frozenFcmCnt": gfaBasicSet.frozenFcmCnt,
                "minuteCnt": gfaBasicSet.minuteCnt,
                "aroundType": gfaBasicSet.aroundType,
                "aroundInsideType": gfaBasicSet.aroundInsideType,
                "changeType": gfaBasicSet.changeType,
                "endTime": gfaBasicSet.endTime
            });