From 8444084e6aa11efa23287e7f82474ac22378a5c4 Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期二, 01 四月 2025 16:03:19 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/management/MgtConfigController.java | 29 +++++++++++++++++++++++++++++
1 files changed, 29 insertions(+), 0 deletions(-)
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/management/MgtConfigController.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/management/MgtConfigController.java
index 2a16ad0..01fa855 100644
--- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/management/MgtConfigController.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/management/MgtConfigController.java
@@ -133,6 +133,16 @@
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();
+ }
+
@RequestMapping(value = "/editAgreement", method = RequestMethod.POST)
@Log(title = "协议管理", businessType = BusinessType.UPDATE,operContent = "修改协议")
@ApiOperation(value = "修改协议")
@@ -280,6 +290,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 +576,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 = "分页获取推荐分配列表")
--
Gitblit v1.7.1