后台修改

xiaoyong931011

2023-08-29 246b7e2857d64e9b590d3dc3317e0b0fc459a11f

 src/main/java/cc/mrbird/febs/dapp/controller/ViewAdminMallGoodsController.java

@@ -10,6 +10,7 @@
import cc.mrbird.febs.dapp.service.IAdminMallGoodsService;
import cc.mrbird.febs.dapp.service.IMallNewsInfoService;
import cc.mrbird.febs.dapp.vo.AdminMallGoodsCategoryVo;
import cc.mrbird.febs.dapp.vo.AdminMallOrderVo;
import cn.hutool.core.util.ObjectUtil;
import lombok.RequiredArgsConstructor;
import org.apache.shiro.authz.annotation.RequiresPermissions;
@@ -117,6 +118,22 @@
        return FebsUtil.view("goods/orderMoneyFlow");
    }

    /**
     * 订单-发货
     * @param id
     * @param model
     * @return
     */
    @GetMapping("deliverGoods/{id}")
    @RequiresPermissions("orderMoneyFlow:update")
//    @RequiresPermissions("deliverGoods:update")
    public String deliverGoods(@PathVariable long id, Model model) {
        AdminMallOrderVo data = mallGoodsService.getMallOrderInfoById(id);
        data.setId(id);
        model.addAttribute("deliverInfo", data);
        return FebsUtil.view("goods/deliverGoods");
    }

    @GetMapping("profitSetting")
    @RequiresPermissions("profitSetting:view")
    public String profitSetting() {
@@ -211,6 +228,20 @@
            String withDrawFee = ObjectUtil.isEmpty(withDrawFeeDic.getValue()) ? "0" : withDrawFeeDic.getValue();
            hlmBasicPerkDto.setWithDrawFee(withDrawFee);
        }
        DataDictionaryCustom minWithdrawDic = dataDictionaryCustomMapper.selectDicDataByTypeAndCode(
                DataDictionaryEnum.MIN_WITHDRAW_AMOUNT.getType(),
                DataDictionaryEnum.MIN_WITHDRAW_AMOUNT.getCode());
        if (withDrawFeeDic != null) {
            String minWithdraw = ObjectUtil.isEmpty(minWithdrawDic.getValue()) ? "0" : minWithdrawDic.getValue();
            hlmBasicPerkDto.setMinWithdraw(minWithdraw);
        }
        DataDictionaryCustom maxWithdrawDic = dataDictionaryCustomMapper.selectDicDataByTypeAndCode(
                DataDictionaryEnum.MAX_WITHDRAW_AMOUNT.getType(),
                DataDictionaryEnum.MAX_WITHDRAW_AMOUNT.getCode());
        if (maxWithdrawDic != null) {
            String maxWithdraw = ObjectUtil.isEmpty(maxWithdrawDic.getValue()) ? "0" : maxWithdrawDic.getValue();
            hlmBasicPerkDto.setMaxWithdraw(maxWithdraw);
        }
        model.addAttribute("hlmBasicPerk", hlmBasicPerkDto);
        return FebsUtil.view("goods/basicPerkSetting");
    }