From fa960ac22a90b4d960865a66f88558924720d608 Mon Sep 17 00:00:00 2001
From: jiangqs <jiangqs>
Date: 星期三, 07 六月 2023 18:00:53 +0800
Subject: [PATCH] 基础配置
---
ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/controller/management/MgtShopController.java | 23 ++++++++++++++++++-----
1 files changed, 18 insertions(+), 5 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 7b98f67..fbbf92a 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,10 +35,10 @@
@RequestMapping("/mgt/shop")
public class MgtShopController {
- @Autowired
+ @Resource
private ShopService shopService;
- @Autowired
+ @Resource
private ShopRelTagService shopRelTagService;
@RequestMapping(value = "/pageMgtShop", method = RequestMethod.POST)
@@ -49,7 +52,7 @@
}
@RequestMapping(value = "/createMgtShop", method = RequestMethod.POST)
- @ApiOperation(value = "创建商户")
+ @ApiOperation(value = "平台编辑商户")
public R createMgtShop(@RequestBody MgtEditShopDto mgtEditShopDto) {
Long userId = SecurityUtils.getUserId();
mgtEditShopDto.setUserId(userId);
@@ -86,4 +89,14 @@
shopService.changeCooperationTime(mgtChangeCoopDto);
return R.ok();
}
+
+ @RequestMapping(value = "/pageMgtShopProportion", method = RequestMethod.POST)
+ @ApiOperation(value = "分页获取商户分成列表")
+ public R<Page<MgtShopPageVo>> pageMgtShopProportion(@RequestBody MgtShopPageDto mgtShopPageDto) {
+ Page<MgtShopPageVo> page = new Page<>();
+ page.setSize(mgtShopPageDto.getPageSize());
+ page.setCurrent(mgtShopPageDto.getPageNum());
+ List<MgtShopPageVo> mgtShopPageVoList = shopService.pageShop(page,mgtShopPageDto);
+ return R.ok(page.setRecords(mgtShopPageVoList));
+ }
}
--
Gitblit v1.7.1