From 3f7a3aefe2965459aed169383b285fba400cfe8c Mon Sep 17 00:00:00 2001
From: jiangqs <343695869@qq.com>
Date: 星期日, 04 六月 2023 13:13:54 +0800
Subject: [PATCH] Merge branch 'master' of http://sinata.cn:10101/gitblit/r/java/HongRuiTang
---
ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/controller/management/MgtShopController.java | 26 +++++++++++++-------------
1 files changed, 13 insertions(+), 13 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..7f1eb58 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
@@ -38,9 +38,9 @@
@Autowired
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 +48,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