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 | 36 ++++++++++++++++++++++++++++-------- 1 files changed, 28 insertions(+), 8 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 fd2ae2b..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 @@ -3,22 +3,18 @@ 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.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.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.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; @@ -40,6 +36,9 @@ @Resource private ShopRelTagService shopRelTagService; + + @Resource + private ShopProportionService shopProportionService; @RequestMapping(value = "/pageMgtShop", method = RequestMethod.POST) @ApiOperation(value = "分页获取商户列表") @@ -89,4 +88,25 @@ 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