From 6cca89c41aea52ae6b23909bb9fbd2834f0094d5 Mon Sep 17 00:00:00 2001
From: jiangqs <jiangqs>
Date: 星期四, 08 六月 2023 18:43:12 +0800
Subject: [PATCH] 基础配置
---
ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/controller/management/MgtShopController.java | 63 +++++++++++++++++++++----------
1 files changed, 43 insertions(+), 20 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..82dec4b 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
@@ -6,18 +6,17 @@
import com.ruoyi.shop.domain.dto.*;
import com.ruoyi.shop.domain.vo.MgtShopInfoVo;
import com.ruoyi.shop.domain.vo.MgtShopPageVo;
+import com.ruoyi.shop.domain.vo.MgtShopProportionPageVo;
import com.ruoyi.shop.domain.vo.MgtShopTagVo;
+import com.ruoyi.shop.service.shop.ShopProportionService;
import com.ruoyi.shop.service.shop.ShopRelTagService;
import com.ruoyi.shop.service.shop.ShopService;
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 org.springframework.web.bind.annotation.*;
+import javax.annotation.Resource;
import java.util.List;
/**
@@ -32,15 +31,18 @@
@RequestMapping("/mgt/shop")
public class MgtShopController {
- @Autowired
+ @Resource
private ShopService shopService;
- @Autowired
+ @Resource
private ShopRelTagService shopRelTagService;
- @RequestMapping(value = "/pageShop", method = RequestMethod.POST)
+ @Resource
+ private ShopProportionService shopProportionService;
+
+ @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,42 +50,63 @@
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);
return R.ok();
}
+
+ @RequestMapping(value = "/pageMgtShopProportion", method = RequestMethod.POST)
+ @ApiOperation(value = "分页获取商户分成列表")
+ public R<Page<MgtShopProportionPageVo>> pageMgtShopProportion(@RequestBody MgtShopProportionPageDto mgtShopProportionPageDto) {
+ Page<MgtShopProportionPageVo> page = new Page<>();
+ page.setSize(mgtShopProportionPageDto.getPageSize());
+ page.setCurrent(mgtShopProportionPageDto.getPageNum());
+ List<MgtShopProportionPageVo> mgtShopProportionPageVoList = shopService.pageMgtShopProportion(page,mgtShopProportionPageDto);
+ return R.ok(page.setRecords(mgtShopProportionPageVoList));
+ }
+
+ @RequestMapping(value = "/editMgtShopProportion", method = RequestMethod.POST)
+ @ApiOperation(value = "修改商户分成")
+ public R editMgtShopProportion(@RequestBody MgtShopProportionEditDto mgtShopProportionEditDto) {
+ mgtShopProportionEditDto.setUserId(SecurityUtils.getUserId());
+ shopProportionService.editMgtShopProportion(mgtShopProportionEditDto);
+ return R.ok();
+ }
+
+
+
}
--
Gitblit v1.7.1