From cbc564a7088503ad8cc7af4e1d2ba417d061e615 Mon Sep 17 00:00:00 2001
From: jiangqs <jiangqs>
Date: 星期五, 30 六月 2023 11:35:05 +0800
Subject: [PATCH] 联调bug和统计完善
---
ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/controller/management/MgtShopController.java | 26 +++++++++++++++++++++++---
1 files changed, 23 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 3faacd8..541079d 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
@@ -3,6 +3,8 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.core.utils.poi.ExcelUtil;
+import com.ruoyi.common.log.annotation.Log;
+import com.ruoyi.common.log.enums.BusinessType;
import com.ruoyi.common.security.utils.SecurityUtils;
import com.ruoyi.shop.domain.dto.*;
import com.ruoyi.shop.domain.vo.*;
@@ -11,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;
@@ -76,8 +79,9 @@
}
@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);
@@ -99,13 +103,23 @@
}
@RequestMapping(value = "/editMgtShopTag", method = RequestMethod.POST)
+ @Log(title = "商户管理", businessType = BusinessType.UPDATE,operContent = "修改商户标签")
@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();
+ }
+
@RequestMapping(value = "/terminateMgtCooperation", method = RequestMethod.POST)
+ @Log(title = "商户管理", businessType = BusinessType.UPDATE,operContent = "终止合作")
@ApiOperation(value = "终止合作")
public R terminateMgtCooperation(@RequestBody MgtTerminateCooperationDto mgtTerminateCooperationDto) {
Long userId = SecurityUtils.getUserId();
@@ -115,6 +129,7 @@
}
@RequestMapping(value = "/changeMgtCooperationTime", method = RequestMethod.POST)
+ @Log(title = "商户管理", businessType = BusinessType.UPDATE,operContent = "修改合作时间")
@ApiOperation(value = "修改合作时间")
public R changeMgtCooperationTime(@RequestBody MgtChangeCoopDto mgtChangeCoopDto) {
Long userId = SecurityUtils.getUserId();
@@ -134,6 +149,7 @@
}
@RequestMapping(value = "/editMgtShopProportion", method = RequestMethod.POST)
+ @Log(title = "商户管理", businessType = BusinessType.UPDATE,operContent = "修改商户分成")
@ApiOperation(value = "修改商户分成")
public R editMgtShopProportion(@RequestBody MgtShopProportionEditDto mgtShopProportionEditDto) {
mgtShopProportionEditDto.setUserId(SecurityUtils.getUserId());
@@ -167,6 +183,7 @@
}
@RequestMapping(value = "/mgtReplayShopSuggest", method = RequestMethod.POST)
+ @Log(title = "商户建议管理", businessType = BusinessType.UPDATE,operContent = "回复商户建议")
@ApiOperation(value = "平台回复建议")
public R mgtReplayShopSuggest(@RequestBody MgtReplayShopSuggestDto mgtReplayShopSuggestDto) {
Long userId = SecurityUtils.getUserId();
@@ -183,7 +200,8 @@
}
@RequestMapping(value = "/mgtEditShopSuggestTag", method = RequestMethod.POST)
- @ApiOperation(value = "平台编辑会员建议标签")
+ @Log(title = "商户建议管理", businessType = BusinessType.UPDATE,operContent = "编辑商户建议标签")
+ @ApiOperation(value = "平台编辑商户建议标签")
public R mgtEditShopSuggestTag(@RequestBody MgtTagShopSuggestDto mgtTagShopSuggestDto) {
Long userId = SecurityUtils.getUserId();
mgtTagShopSuggestDto.setUserId(userId);
@@ -204,6 +222,7 @@
}
@RequestMapping(value = "/mgtAuditShopCertificate", method = RequestMethod.POST)
+ @Log(title = "商户证书管理", businessType = BusinessType.UPDATE,operContent = "审核商户证书")
@ApiOperation(value = "平台审核商户证书")
public R mgtAuditShopCertificate(@RequestBody MgtAuditShopCertificateDto mgtAuditShopCertificateDto) {
Long userId = SecurityUtils.getUserId();
@@ -233,6 +252,7 @@
}
@RequestMapping(value = "/mgtShopAuth", method = RequestMethod.POST)
+ @Log(title = "商户进件管理", businessType = BusinessType.UPDATE,operContent = "商户进件")
@ApiOperation(value = "平台商户进件")
public R mgtShopAuth(@RequestBody MgtShopAuthDto mgtShopAuthDto) {
Long userId = SecurityUtils.getUserId();
@@ -249,7 +269,7 @@
}
@RequestMapping(value = "/getMgtShopAuthCode", method = RequestMethod.POST)
- @ApiOperation(value = "获取商户进件信息")
+ @ApiOperation(value = "获取商户进件验证信息")
public R<MgtShopAuthCodeVo> getMgtShopAuthCode(@RequestBody MgtShopAuthGetDto mgtShopAuthGetDto) {
MgtShopAuthCodeVo mgtShopAuthCodeVo = shopService.getMgtShopAuthCode(mgtShopAuthGetDto.getAuthId());
return R.ok(mgtShopAuthCodeVo);
--
Gitblit v1.7.1