From 306c67fe623de2273d70a92ea5faac24c42b1960 Mon Sep 17 00:00:00 2001
From: jiangqs <jiangqs>
Date: 星期二, 06 六月 2023 15:23:35 +0800
Subject: [PATCH] 基础配置

---
 ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/controller/management/MgtShopController.java |   37 ++++++++++++++++++++-----------------
 1 files changed, 20 insertions(+), 17 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 00fc1bb..fd2ae2b 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,7 +3,10 @@
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.ruoyi.common.core.domain.R;
 import com.ruoyi.common.security.utils.SecurityUtils;
-import com.ruoyi.shop.domain.dto.*;
+import com.ruoyi.shop.domain.dto.MgtChangeCoopDto;
+import com.ruoyi.shop.domain.dto.MgtEditShopDto;
+import com.ruoyi.shop.domain.dto.MgtEditShopTagDto;
+import com.ruoyi.shop.domain.dto.MgtShopPageDto;
 import com.ruoyi.shop.domain.vo.MgtShopInfoVo;
 import com.ruoyi.shop.domain.vo.MgtShopPageVo;
 import com.ruoyi.shop.domain.vo.MgtShopTagVo;
@@ -12,12 +15,12 @@
 import com.ruoyi.system.api.domain.dto.MgtBaseGetDto;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RestController;
 
+import javax.annotation.Resource;
 import java.util.List;
 
 /**
@@ -32,15 +35,15 @@
 @RequestMapping("/mgt/shop")
 public class MgtShopController {
 
-    @Autowired
+    @Resource
     private ShopService shopService;
 
-    @Autowired
+    @Resource
     private ShopRelTagService shopRelTagService;
 
-    @RequestMapping(value = "/pageShop", method = RequestMethod.POST)
+    @RequestMapping(value = "/pageMgtShop", method = RequestMethod.POST)
     @ApiOperation(value = "分页获取商户列表")
-    public R<Page<MgtShopPageVo>> pageShop(@RequestBody MgtShopPageDto mgtShopPageDto) {
+    public R<Page<MgtShopPageVo>> pageMgtShop(@RequestBody MgtShopPageDto mgtShopPageDto) {
         Page<MgtShopPageVo> page = new Page<>();
         page.setSize(mgtShopPageDto.getPageSize());
         page.setCurrent(mgtShopPageDto.getPageNum());
@@ -48,39 +51,39 @@
         return R.ok(page.setRecords(mgtShopPageVoList));
     }
 
-    @RequestMapping(value = "/createShop", method = RequestMethod.POST)
-    @ApiOperation(value = "创建商户")
-    public R createShop(@RequestBody MgtEditShopDto mgtEditShopDto) {
+    @RequestMapping(value = "/createMgtShop", method = RequestMethod.POST)
+    @ApiOperation(value = "平台编辑商户")
+    public R createMgtShop(@RequestBody MgtEditShopDto mgtEditShopDto) {
         Long userId = SecurityUtils.getUserId();
         mgtEditShopDto.setUserId(userId);
         shopService.createShop(mgtEditShopDto);
         return R.ok();
     }
 
-    @RequestMapping(value = "/getShopInfo", method = RequestMethod.POST)
+    @RequestMapping(value = "/getMgtShopInfo", method = RequestMethod.POST)
     @ApiOperation(value = "获取商户详情")
-    public R<MgtShopInfoVo> getShopInfo(@RequestBody MgtBaseGetDto mgtBaseGetDto) {
+    public R<MgtShopInfoVo> getMgtShopInfo(@RequestBody MgtBaseGetDto mgtBaseGetDto) {
         MgtShopInfoVo mgtShopInfoVo = shopService.getMgtShopInfo(Long.valueOf(mgtBaseGetDto.getId()));
         return R.ok(mgtShopInfoVo);
     }
 
-    @RequestMapping(value = "/getShopTag", method = RequestMethod.POST)
+    @RequestMapping(value = "/getMgtShopTag", method = RequestMethod.POST)
     @ApiOperation(value = "获取商户标签")
-    public R<List<MgtShopTagVo>> getShopTag(@RequestBody MgtBaseGetDto mgtBaseGetDto) {
+    public R<List<MgtShopTagVo>> getMgtShopTag(@RequestBody MgtBaseGetDto mgtBaseGetDto) {
         List<MgtShopTagVo> mgtShopInfoVoList = shopRelTagService.listShopTagVo(Long.valueOf(mgtBaseGetDto.getId()));
         return R.ok(mgtShopInfoVoList);
     }
 
-    @RequestMapping(value = "/editShopTag", method = RequestMethod.POST)
+    @RequestMapping(value = "/editMgtShopTag", method = RequestMethod.POST)
     @ApiOperation(value = "修改商户标签")
-    public R editShopTag(@RequestBody MgtEditShopTagDto mgtEditShopTagDto) {
+    public R editMgtShopTag(@RequestBody MgtEditShopTagDto mgtEditShopTagDto) {
         shopService.editShopTag(mgtEditShopTagDto);
         return R.ok();
     }
 
-    @RequestMapping(value = "/changeCooperationTime", method = RequestMethod.POST)
+    @RequestMapping(value = "/changeMgtCooperationTime", method = RequestMethod.POST)
     @ApiOperation(value = "修改合作时间")
-    public R changeCooperationTime(@RequestBody MgtChangeCoopDto mgtChangeCoopDto) {
+    public R changeMgtCooperationTime(@RequestBody MgtChangeCoopDto mgtChangeCoopDto) {
         Long userId = SecurityUtils.getUserId();
         mgtChangeCoopDto.setUserId(userId);
         shopService.changeCooperationTime(mgtChangeCoopDto);

--
Gitblit v1.7.1