20220902

xiaoyong931011

2022-09-09 c2a2a7f123eb1ac950d51da5033ddc3d23567765

 src/main/java/cc/mrbird/febs/mall/controller/ViewMallTeamLeaderController.java

@@ -5,11 +5,12 @@
import cc.mrbird.febs.common.enumerates.DataDictionaryEnum;
import cc.mrbird.febs.common.utils.FebsUtil;
import cc.mrbird.febs.mall.entity.DataDictionaryCustom;
import cc.mrbird.febs.mall.service.IAdminMallOrderService;
import cc.mrbird.febs.mall.entity.MallMember;
import cc.mrbird.febs.mall.mapper.DataDictionaryCustomMapper;
import cc.mrbird.febs.mall.mapper.MallMemberMapper;
import cc.mrbird.febs.mall.service.IAdminMallTeamLeaderService;
import cc.mrbird.febs.mall.vo.AdminMallOrderVo;
import cc.mrbird.febs.mall.vo.AdminLeaderBonusSettingVo;
import cc.mrbird.febs.mall.vo.AdminMallTeamLeaderVo;
import cc.mrbird.febs.mall.vo.AdminRangeSettingVo;
import cn.hutool.core.util.ObjectUtil;
import lombok.RequiredArgsConstructor;
import org.apache.shiro.authz.annotation.RequiresPermissions;
@@ -25,6 +26,8 @@
public class ViewMallTeamLeaderController extends BaseController {

    private final IAdminMallTeamLeaderService iAdminMallTeamLeaderService;
    private final DataDictionaryCustomMapper dataDictionaryCustomMapper;
    private final MallMemberMapper mallMemberMapper;

    /**
     * 团长信息--列表
@@ -59,7 +62,8 @@

    @GetMapping("addLeader/{id}")
    public String addLeader(@PathVariable long id, Model model) {
        model.addAttribute("memberId", id);
        MallMember mallMember = mallMemberMapper.selectById(id);
        model.addAttribute("mallMember", mallMember);
        return FebsUtil.view("modules/leader/addLeader");
    }

@@ -71,20 +75,25 @@
     */
    @GetMapping("/leaderBonusSetting")
    public String deliverySetting(Model model) {
//        AdminRangeSettingVo adminRangeSettingVo = new AdminRangeSettingVo();
//        DataDictionaryCustom deliverySetting = dataDictionaryCustomMapper.selectDicDataByTypeAndCode(DataDictionaryEnum.HOME_DELIVERY_AMOUNT.getType(), DataDictionaryEnum.HOME_DELIVERY_AMOUNT.getCode());
//        if (ObjectUtil.isNotNull(deliverySetting)) {
//            adminRangeSettingVo.setHomeDeliveryAmount(Double.parseDouble(deliverySetting.getValue()));
//        }
//        DataDictionaryCustom rangeSwitch = dataDictionaryCustomMapper.selectDicDataByTypeAndCode(DataDictionaryEnum.RANGE_SWITCH.getType(), DataDictionaryEnum.RANGE_SWITCH.getCode());
//        if (ObjectUtil.isNotNull(rangeSwitch)) {
//            adminRangeSettingVo.setRangeSwitch(Integer.parseInt(rangeSwitch.getValue()));
//        }
//        DataDictionaryCustom rangeSize = dataDictionaryCustomMapper.selectDicDataByTypeAndCode(DataDictionaryEnum.RANGE_SIZE.getType(), DataDictionaryEnum.RANGE_SIZE.getCode());
//        if (ObjectUtil.isNotNull(rangeSize)) {
//            adminRangeSettingVo.setRangeSize(Integer.parseInt(rangeSize.getValue()));
//        }
//        model.addAttribute("deliverySetting", adminRangeSettingVo);
        return FebsUtil.view("modules/goods/deliverySetting");
        AdminLeaderBonusSettingVo adminLeaderBonusSettingVo = new AdminLeaderBonusSettingVo();
        DataDictionaryCustom bonusSwitch = dataDictionaryCustomMapper.selectDicDataByTypeAndCode(DataDictionaryEnum.BONUS_SWITCH.getType(), DataDictionaryEnum.BONUS_SWITCH.getCode());
        if (ObjectUtil.isNotNull(bonusSwitch)) {
            adminLeaderBonusSettingVo.setBonusSwitch(Integer.parseInt(bonusSwitch.getValue()));
        }
        DataDictionaryCustom bonusPercent = dataDictionaryCustomMapper.selectDicDataByTypeAndCode(DataDictionaryEnum.BONUS_PERCENT.getType(), DataDictionaryEnum.BONUS_PERCENT.getCode());
        if (ObjectUtil.isNotNull(bonusPercent)) {
            adminLeaderBonusSettingVo.setBonusPercent(bonusPercent.getValue());
        }
        model.addAttribute("leaderBonusSetting", adminLeaderBonusSettingVo);
        return FebsUtil.view("modules/leader/leaderBonusSetting");
    }

    /**
     * 团长区域--电子围栏
     */
    @GetMapping("leaderMapSetting")
    @RequiresPermissions("leaderMapSetting:view")
    public String leaderMapSetting() {
        return FebsUtil.view("modules/leader/leaderMapSetting");
    }
}