From f975b6d0832b447654aaf2372ce72f71ebb7f095 Mon Sep 17 00:00:00 2001
From: chenye <chenye0811@qq.com>
Date: 星期二, 11 七月 2023 11:11:55 +0800
Subject: [PATCH] 1
---
ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/controller/management/MgtShopController.java | 16 +++++++++++++---
1 files changed, 13 insertions(+), 3 deletions(-)
diff --git a/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/controller/management/MgtShopController.java b/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/controller/management/MgtShopController.java
index d378a00..d2a9d9c 100644
--- a/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/controller/management/MgtShopController.java
+++ b/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/controller/management/MgtShopController.java
@@ -69,7 +69,7 @@
@RequestMapping(value = "/exportPageMgtShop", method = RequestMethod.POST)
@ApiOperation(value = "导出商户列表")
- public void exportPageMgtShop(@RequestBody MgtShopPageDto mgtShopPageDto, HttpServletResponse response) {
+ public void exportPageMgtShop(MgtShopPageDto mgtShopPageDto, HttpServletResponse response) {
Page<MgtShopPageVo> page = new Page<>();
page.setSize(2000);
page.setCurrent(1);
@@ -107,6 +107,14 @@
@ApiOperation(value = "修改商户标签")
public R editMgtShopTag(@RequestBody MgtEditShopTagDto mgtEditShopTagDto) {
shopService.editShopTag(mgtEditShopTagDto);
+ return R.ok();
+ }
+
+ @RequestMapping(value = "/transferMgtShop", method = RequestMethod.POST)
+ @Log(title = "商户管理", businessType = BusinessType.UPDATE,operContent = "转移客户")
+ @ApiOperation(value = "转移客户")
+ public R transferMgtShop(@RequestBody MgtTransferShopDto mgtTransferShopDto) {
+ shopService.transferMgtShop(mgtTransferShopDto);
return R.ok();
}
@@ -163,7 +171,7 @@
@RequestMapping(value = "/exportPageMgtShopSuggest", method = RequestMethod.POST)
@ApiOperation(value = "导出商户建议列表")
- public void exportPageMgtShopSuggest(@RequestBody MgtShopSuggestPageDto mgtShopSuggestPageDto, HttpServletResponse response) {
+ public void exportPageMgtShopSuggest(MgtShopSuggestPageDto mgtShopSuggestPageDto, HttpServletResponse response) {
Long userId = SecurityUtils.getUserId();
mgtShopSuggestPageDto.setUserId(userId);
Page<MgtShopSuggestPageVo> page = new Page<>();
@@ -246,7 +254,7 @@
@RequestMapping(value = "/mgtShopAuth", method = RequestMethod.POST)
@Log(title = "商户进件管理", businessType = BusinessType.UPDATE,operContent = "商户进件")
@ApiOperation(value = "平台商户进件")
- public R mgtShopAuth(@RequestBody MgtShopAuthDto mgtShopAuthDto) {
+ public R mgtShopAuth(@Validated @RequestBody MgtShopAuthDto mgtShopAuthDto) {
Long userId = SecurityUtils.getUserId();
mgtShopAuthDto.setUserId(userId);
shopService.mgtShopAuth(mgtShopAuthDto);
@@ -266,4 +274,6 @@
MgtShopAuthCodeVo mgtShopAuthCodeVo = shopService.getMgtShopAuthCode(mgtShopAuthGetDto.getAuthId());
return R.ok(mgtShopAuthCodeVo);
}
+
+
}
--
Gitblit v1.7.1