Merge remote-tracking branch 'origin/2.0' into 2.0

Pu Zhibing

2 天以前 49c5117caef44d1e817d2ef701529dfaf1443467

 ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/management/MgtConfigController.java

@@ -12,6 +12,7 @@
import com.ruoyi.system.api.domain.dto.MgtPageDto;
import com.ruoyi.system.api.domain.vo.MgtBulletinBoardVo;
import com.ruoyi.system.domain.dto.*;
import com.ruoyi.system.domain.pojo.config.BottomNav;
import com.ruoyi.system.domain.vo.*;
import com.ruoyi.system.service.config.*;
import io.swagger.annotations.Api;
@@ -78,6 +79,9 @@
    @Resource
    private RecommendCooperationService recommendCooperationService;

    @Resource
    private BottomNavService bottomNavService;


    @RequestMapping(value = "/getCustomConfig", method = RequestMethod.POST)
    @ApiOperation(value = "获取单个配置")
@@ -130,6 +134,16 @@
        Long userId = SecurityUtils.getUserId();
        mgtServiceCodeEditDto.setUserId(userId);
        customConfigService.editServiceCode(mgtServiceCodeEditDto);
        return R.ok();
    }

    @RequestMapping(value = "/editShopProportion", method = RequestMethod.POST)
    @Log(title = "商户分成管理", businessType = BusinessType.UPDATE,operContent = "修改商户分成")
    @ApiOperation(value = "修改商户分成")
    public R editShopProportion(@RequestBody MgtShopCommonProportionEditDto mgtShopCommonProportionEditDto) {
        Long userId = SecurityUtils.getUserId();
        mgtShopCommonProportionEditDto.setUserId(userId);
        customConfigService.editShopProportion(mgtShopCommonProportionEditDto);
        return R.ok();
    }

@@ -225,6 +239,18 @@
        return R.ok();
    }

    @RequestMapping(value = "/getBottomNav", method = RequestMethod.GET)
    @ApiOperation(value = "获取底部导航栏配置数据")
    public R<List<BottomNav>> getBottomNav() {
        List<BottomNav> list = bottomNavService.getAllBottomNav();
        return R.ok(list);
    }
    @RequestMapping(value = "/editBottomNav", method = RequestMethod.PUT)
    @ApiOperation(value = "获取底部导航栏配置数据")
    public R<Void> editBottomNav(@RequestBody BottomNavDto bottomNavDto) {
        return bottomNavService.editBottomNav(bottomNavDto);
    }

    @RequestMapping(value = "/pageQuickEntry", method = RequestMethod.POST)
    @ApiOperation(value = "分页获取快速入口")
    public R<Page<MgtQuickEntryPageVo>> pageQuickEntry(@RequestBody MgtPageDto mgtPageDto) {
@@ -280,6 +306,16 @@
        customConfigService.editOtherConfig(mgtOtherConfigEditDto);
        return R.ok();
    }
    
    
    @RequestMapping(value = "/editStoreCurriculum", method = RequestMethod.POST)
    @Log(title = "其它设置管理", businessType = BusinessType.UPDATE,operContent = "修改门店课程设置")
    @ApiOperation(value = "修改门店课程设置")
    public R editStoreCurriculum(@Validated @RequestBody MgtStoreCurriculumEditDto mgtStoreCurriculumEditDto) {
        customConfigService.editStoreCurriculum(mgtStoreCurriculumEditDto);
        return R.ok();
    }
    

    @RequestMapping(value = "/editShopConfig", method = RequestMethod.POST)
    @Log(title = "其它设置管理", businessType = BusinessType.UPDATE,operContent = "修改合作商配置")
@@ -556,6 +592,15 @@
        List<RegionVo> regionVoList = regionService.listCityVo();
        return R.ok(regionVoList);
    }
    
    @RequestMapping(value = "/listRegions", method = RequestMethod.GET)
    @ApiOperation(value = "获取省市区列表")
    public R<List<RegionVo>> listRegions(Long pid){
        List<RegionVo> regionVoList = regionService.listRegions(pid);
        return R.ok(regionVoList);
    }
    
    

    @RequestMapping(value = "/pageAllotRecommend", method = RequestMethod.POST)
    @ApiOperation(value = "分页获取推荐分配列表")