From 257ce232897d0e4a232e827ba61516b747389078 Mon Sep 17 00:00:00 2001
From: zhanglin <852614290@qq.com>
Date: 星期日, 23 七月 2023 16:04:35 +0800
Subject: [PATCH] Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/HongRuiTang
---
ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/controller/management/MgtShopController.java | 29 +++++++++++++++++++++++++----
1 files changed, 25 insertions(+), 4 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 c8dac50..dcc54e9 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
@@ -13,6 +13,7 @@
import com.ruoyi.system.api.domain.vo.MgtSimpleShopVo;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
+import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestMethod;
@@ -68,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);
@@ -80,7 +81,7 @@
@RequestMapping(value = "/createMgtShop", method = RequestMethod.POST)
@Log(title = "商户管理", businessType = BusinessType.UPDATE,operContent = "编辑商户")
@ApiOperation(value = "平台编辑商户")
- public R createMgtShop(@RequestBody MgtEditShopDto mgtEditShopDto) {
+ public R createMgtShop(@Validated @RequestBody MgtEditShopDto mgtEditShopDto) {
Long userId = SecurityUtils.getUserId();
mgtEditShopDto.setUserId(userId);
shopService.createShop(mgtEditShopDto);
@@ -109,6 +110,14 @@
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();
+ }
+
@RequestMapping(value = "/terminateMgtCooperation", method = RequestMethod.POST)
@Log(title = "商户管理", businessType = BusinessType.UPDATE,operContent = "终止合作")
@ApiOperation(value = "终止合作")
@@ -116,6 +125,16 @@
Long userId = SecurityUtils.getUserId();
mgtTerminateCooperationDto.setUserId(userId);
shopService.terminateMgtCooperation(mgtTerminateCooperationDto);
+ return R.ok();
+ }
+
+ @RequestMapping(value = "/frozenMgtShop", method = RequestMethod.POST)
+ @Log(title = "商户管理", businessType = BusinessType.UPDATE,operContent = "终止合作")
+ @ApiOperation(value = "冻结商户")
+ public R frozenMgtShop(@RequestBody MgtFrozenShopDto mgtFrozenShopDto) {
+ Long userId = SecurityUtils.getUserId();
+ mgtFrozenShopDto.setUserId(userId);
+ shopService.frozenMgtShop(mgtFrozenShopDto);
return R.ok();
}
@@ -162,7 +181,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<>();
@@ -245,7 +264,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);
@@ -265,4 +284,6 @@
MgtShopAuthCodeVo mgtShopAuthCodeVo = shopService.getMgtShopAuthCode(mgtShopAuthGetDto.getAuthId());
return R.ok(mgtShopAuthCodeVo);
}
+
+
}
--
Gitblit v1.7.1