From 60e726c81966b042db4f7b108d06bd36109794de Mon Sep 17 00:00:00 2001
From: huliguo <2023611923@qq.com>
Date: 星期三, 18 六月 2025 12:21:11 +0800
Subject: [PATCH] 抽奖管理、一键同步
---
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/management/MgtConfigController.java | 137 ++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 127 insertions(+), 10 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 0e3fce0..10b3457 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
@@ -1,5 +1,6 @@
package com.ruoyi.system.controller.management;
+import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.core.utils.poi.ExcelUtil;
@@ -7,11 +8,13 @@
import com.ruoyi.common.log.annotation.Log;
import com.ruoyi.common.log.enums.BusinessType;
import com.ruoyi.common.security.utils.SecurityUtils;
+import com.ruoyi.system.api.domain.dto.MGtOneClinkSyncingShopPageDTO;
import com.ruoyi.system.api.domain.dto.MgtBaseGetDto;
import com.ruoyi.system.api.domain.dto.MgtClassNumDto;
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 +81,12 @@
@Resource
private RecommendCooperationService recommendCooperationService;
+ @Resource
+ private BottomNavService bottomNavService;
+
+ @Resource
+ private OneClinkSyncingService oneClinkSyncingService;
+
@RequestMapping(value = "/getCustomConfig", method = RequestMethod.POST)
@ApiOperation(value = "获取单个配置")
@@ -133,6 +142,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 = "修改协议")
@@ -145,7 +164,7 @@
@RequestMapping(value = "/editBanner", method = RequestMethod.POST)
@Log(title = "banner管理", businessType = BusinessType.UPDATE,operContent = "修改banner")
- @ApiOperation(value = "修改banner")
+ @ApiOperation(value = "修改banner【2.0】")
public R editBanner(@RequestBody MgtBannerEditDto mgtBannerEditDto) {
Long userId = SecurityUtils.getUserId();
mgtBannerEditDto.setUserId(userId);
@@ -166,7 +185,7 @@
}
@RequestMapping(value = "/getBanner", method = RequestMethod.POST)
- @ApiOperation(value = "获取banner编辑信息")
+ @ApiOperation(value = "获取banner编辑信息【2.0】")
public R<MgtBannerGetVo> getBanner(@RequestBody MgtBaseGetDto mgtBaseGetDto) {
Long userId = SecurityUtils.getUserId();
mgtBaseGetDto.setUserId(userId);
@@ -198,7 +217,7 @@
@RequestMapping(value = "/editPop", method = RequestMethod.POST)
@Log(title = "弹窗管理", businessType = BusinessType.UPDATE,operContent = "修改弹窗广告")
- @ApiOperation(value = "修改弹窗广告")
+ @ApiOperation(value = "修改弹窗广告【2.0】")
public R editPop(@RequestBody MgtPopEditDto mgtPopEditDto) {
Long userId = SecurityUtils.getUserId();
mgtPopEditDto.setUserId(userId);
@@ -207,7 +226,7 @@
}
@RequestMapping(value = "/getPop", method = RequestMethod.POST)
- @ApiOperation(value = "获取弹窗编辑信息")
+ @ApiOperation(value = "获取弹窗编辑信息【2.0】")
public R<MgtPopGetVo> getPop(@RequestBody MgtBaseGetDto mgtBaseGetDto) {
Long userId = SecurityUtils.getUserId();
mgtBaseGetDto.setUserId(userId);
@@ -225,6 +244,18 @@
return R.ok();
}
+ @RequestMapping(value = "/getBottomNav", method = RequestMethod.GET)
+ @ApiOperation(value = "获取底部导航栏配置数据【2.0】")
+ public R<List<BottomNav>> getBottomNav() {
+ List<BottomNav> list = bottomNavService.getAllBottomNav();
+ return R.ok(list);
+ }
+ @RequestMapping(value = "/editBottomNav", method = RequestMethod.PUT)
+ @ApiOperation(value = "获取底部导航栏配置数据【2.0】")
+ 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) {
@@ -239,7 +270,7 @@
@RequestMapping(value = "/editQuickEntry", method = RequestMethod.POST)
@Log(title = "快速入口管理", businessType = BusinessType.UPDATE,operContent = "修改快速入口")
- @ApiOperation(value = "修改快速入口")
+ @ApiOperation(value = "修改快速入口【2.0】")
public R editQuickEntry(@RequestBody MgtQuickEntryEditDto mgtQuickEntryEditDto) {
Long userId = SecurityUtils.getUserId();
mgtQuickEntryEditDto.setUserId(userId);
@@ -248,7 +279,7 @@
}
@RequestMapping(value = "/getQuickEntry", method = RequestMethod.POST)
- @ApiOperation(value = "获取快速入口编辑信息")
+ @ApiOperation(value = "获取快速入口编辑信息【2.0】")
public R<MgtQuickEntryGetVo> getQuickEntry(@RequestBody MgtBaseGetDto mgtBaseGetDto) {
Long userId = SecurityUtils.getUserId();
mgtBaseGetDto.setUserId(userId);
@@ -280,6 +311,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 = "修改合作商配置")
@@ -411,14 +452,47 @@
return R.ok(page.setRecords(mgtTagPageVoList));
}
- @ApiOperation(value = "导入标签")
- @PostMapping("/importData")
- public AjaxResult importData(MultipartFile file, Integer tagType) throws Exception
+ @ApiOperation(value = "导入商品标签")
+ @PostMapping("/importGoodsTagData")
+ public AjaxResult importGoodsTagData(@RequestPart("file")MultipartFile file) throws Exception
{
ExcelUtil<MgtTagImportDto> util = new ExcelUtil<MgtTagImportDto>(MgtTagImportDto.class);
List<MgtTagImportDto> tagList = util.importExcel(file.getInputStream());
String operName = SecurityUtils.getUsername();
- String message = sysTagService.importTag(tagList, tagType, operName);
+ String message = sysTagService.importTag(tagList, 1, operName);
+ return success(message);
+ }
+
+ @ApiOperation(value = "导入用户标签")
+ @PostMapping("/importUserTagData")
+ public AjaxResult importUserTagData(@RequestPart("file")MultipartFile file) throws Exception
+ {
+ ExcelUtil<MgtTagImportDto> util = new ExcelUtil<MgtTagImportDto>(MgtTagImportDto.class);
+ List<MgtTagImportDto> tagList = util.importExcel(file.getInputStream());
+ String operName = SecurityUtils.getUsername();
+ String message = sysTagService.importTag(tagList, 2, operName);
+ return success(message);
+ }
+
+ @ApiOperation(value = "导入商户标签")
+ @PostMapping("/importShopTagData")
+ public AjaxResult importShopTagData(@RequestPart("file")MultipartFile file) throws Exception
+ {
+ ExcelUtil<MgtTagImportDto> util = new ExcelUtil<MgtTagImportDto>(MgtTagImportDto.class);
+ List<MgtTagImportDto> tagList = util.importExcel(file.getInputStream());
+ String operName = SecurityUtils.getUsername();
+ String message = sysTagService.importTag(tagList, 3, operName);
+ return success(message);
+ }
+
+ @ApiOperation(value = "导入建议标签")
+ @PostMapping("/importSuggestTagData")
+ public AjaxResult importSuggestTagData(@RequestPart("file")MultipartFile file) throws Exception
+ {
+ ExcelUtil<MgtTagImportDto> util = new ExcelUtil<MgtTagImportDto>(MgtTagImportDto.class);
+ List<MgtTagImportDto> tagList = util.importExcel(file.getInputStream());
+ String operName = SecurityUtils.getUsername();
+ String message = sysTagService.importTag(tagList, 4, operName);
return success(message);
}
@@ -523,6 +597,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 = "分页获取推荐分配列表")
@@ -552,5 +635,39 @@
return R.ok(bulletinBoard);
}
+ @RequestMapping(value = "/pageOneClinkSyncing", method = RequestMethod.POST)
+ @ApiOperation(value = "分页获取一键同步【2.0】")
+ public R<IPage<MgtOneClinkSyncPageVO>> pageOneClinkSyncing(@RequestBody MgtOneClinkSyncingPageDTO mgtPageDto) {
+ return R.ok(oneClinkSyncingService.pageOneClinkSyncing(mgtPageDto));
+ }
+
+ @RequestMapping(value = "/editOneClinkSyncing", method = RequestMethod.POST)
+ @Log(title = "一键同步管理", businessType = BusinessType.UPDATE,operContent = "修改一键同步")
+ @ApiOperation(value = "修改一键同步【2.0】")
+ public R editOneClinkSyncing(@RequestBody MgtOneClinkSyncingEditDto dto) {
+ Long userId = SecurityUtils.getUserId();
+ dto.setUserId(userId);
+ return oneClinkSyncingService.editOneClinkSyncing(dto);
+ }
+
+ @RequestMapping(value = "/getOneClinkSyncing", method = RequestMethod.POST)
+ @ApiOperation(value = "获取一键同步信息(查看详情)【2.0】")
+ public R<MgtOneClinkSyncingVO> getOneClinkSyncing(@RequestBody MGtOneClinkSyncingShopPageDTO dto ) {
+ return oneClinkSyncingService.getOneClinkSyncing(dto);
+ }
+
+ @RequestMapping(value = "/deleteOneClinkSyncing", method = RequestMethod.GET)
+ @Log(title = "一键同步管理", businessType = BusinessType.DELETE,operContent = "删除一键同步")
+ @ApiOperation(value = "删除一键同步【2.0】")
+ public R deleteOneClinkSyncing(@RequestParam("syncingId") Integer syncingId ) {
+ return oneClinkSyncingService.deleteOneClinkSyncing(syncingId);
+ }
+
+ @RequestMapping(value = "/executeOneClinkSyncing", method = RequestMethod.GET)
+ @Log(title = "一键同步管理", businessType = BusinessType.UPDATE,operContent = "执行一键同步")
+ @ApiOperation(value = "执行一键同步【2.0】")
+ public R executeOneClinkSyncing(@RequestParam("syncingId") Integer syncingId ) {
+ return oneClinkSyncingService.executeOneClinkSyncing(syncingId);
+ }
}
--
Gitblit v1.7.1