From c00d0d3bc399b6648145dfd955cedbea90f5f99d Mon Sep 17 00:00:00 2001 From: jiangqs <343695869@qq.com> Date: 星期日, 18 六月 2023 17:38:22 +0800 Subject: [PATCH] 看板 --- ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/controller/management/MgtShopController.java | 156 ++++++++++++++++++++++++++++++++++++++++++++------- 1 files changed, 133 insertions(+), 23 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..22ac099 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 @@ -4,20 +4,18 @@ 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.vo.MgtShopInfoVo; -import com.ruoyi.shop.domain.vo.MgtShopPageVo; -import com.ruoyi.shop.domain.vo.MgtShopTagVo; -import com.ruoyi.shop.service.shop.ShopRelTagService; -import com.ruoyi.shop.service.shop.ShopService; +import com.ruoyi.shop.domain.vo.*; +import com.ruoyi.shop.service.shop.*; import com.ruoyi.system.api.domain.dto.MgtBaseGetDto; +import com.ruoyi.system.api.domain.vo.MgtSimpleShopVo; 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,58 +30,170 @@ @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; + + @Resource + private ShopSuggestService shopSuggestService; + + @Resource + private ShopCertificateService shopCertificateService; + + @RequestMapping(value = "/listMgtShopSimpleVo", method = RequestMethod.POST) @ApiOperation(value = "分页获取商户列表") - public R<Page<MgtShopPageVo>> pageShop(@RequestBody MgtShopPageDto mgtShopPageDto) { + public R<List<MgtShopListSimpleVo>> listMgtShopSimpleVo(@RequestBody MgtShopListDto mgtShopListDto) { + List<MgtShopListSimpleVo> mgtShopListSimpleVoList = shopService.listMgtShopSimpleVo(mgtShopListDto); + return R.ok(mgtShopListSimpleVoList); + } + + @RequestMapping(value = "/pageMgtShop", method = RequestMethod.POST) + @ApiOperation(value = "分页获取商户列表") + public R<Page<MgtShopPageVo>> pageMgtShop(@RequestBody MgtShopPageDto mgtShopPageDto) { Page<MgtShopPageVo> page = new Page<>(); page.setSize(mgtShopPageDto.getPageSize()); page.setCurrent(mgtShopPageDto.getPageNum()); - List<MgtShopPageVo> mgtShopPageVoList = shopService.pageShop(page,mgtShopPageDto); + List<MgtShopPageVo> mgtShopPageVoList = shopService.pageMgtShop(page,mgtShopPageDto); 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) { - List<MgtShopTagVo> mgtShopInfoVoList = shopRelTagService.listShopTagVo(Long.valueOf(mgtBaseGetDto.getId())); + public R<List<MgtShopTagVo>> getMgtShopTag(@RequestBody MgtBaseGetDto mgtBaseGetDto) { + List<MgtShopTagVo> mgtShopInfoVoList = shopRelTagService.listShopTagVo(mgtBaseGetDto); 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(); + } + + @RequestMapping(value = "/pageMgtShopSuggest", method = RequestMethod.POST) + @ApiOperation(value = "平台获取商户建议列表") + public R<Page<MgtShopSuggestPageVo>> pageMgtShopSuggest(@RequestBody MgtShopSuggestPageDto mgtShopSuggestPageDto) { + Long userId = SecurityUtils.getUserId(); + mgtShopSuggestPageDto.setUserId(userId); + Page<MgtShopSuggestPageVo> page = new Page<>(); + page.setSize(mgtShopSuggestPageDto.getPageSize()); + page.setCurrent(mgtShopSuggestPageDto.getPageNum()); + List<MgtShopSuggestPageVo> mgtShopSuggestPageVoList = shopSuggestService.pageMgtShopSuggest(page,mgtShopSuggestPageDto); + return R.ok(page.setRecords(mgtShopSuggestPageVoList)); + } + + @RequestMapping(value = "/mgtReplayShopSuggest", method = RequestMethod.POST) + @ApiOperation(value = "平台回复会员建议") + public R mgtReplayShopSuggest(@RequestBody MgtReplayShopSuggestDto mgtReplayShopSuggestDto) { + Long userId = SecurityUtils.getUserId(); + mgtReplayShopSuggestDto.setUserId(userId); + shopSuggestService.mgtReplayShopSuggest(mgtReplayShopSuggestDto); + return R.ok(); + } + + @RequestMapping(value = "/listMgtShopSuggestTag", method = RequestMethod.POST) + @ApiOperation(value = "获取商户建议标签") + public R<List<MgtShopSuggestTagVo>> listMgtShopSuggestTag(@RequestBody MgtBaseGetDto mgtBaseGetDto) { + List<MgtShopSuggestTagVo> mgtShopSuggestTagVoList = shopSuggestService.listMgtShopSuggestTag(Long.valueOf(mgtBaseGetDto.getId())); + return R.ok(mgtShopSuggestTagVoList); + } + + @RequestMapping(value = "/mgtEditShopSuggestTag", method = RequestMethod.POST) + @ApiOperation(value = "平台编辑会员建议标签") + public R mgtEditShopSuggestTag(@RequestBody MgtTagShopSuggestDto mgtTagShopSuggestDto) { + Long userId = SecurityUtils.getUserId(); + mgtTagShopSuggestDto.setUserId(userId); + shopSuggestService.mgtEditShopSuggestTag(mgtTagShopSuggestDto); + return R.ok(); + } + + @RequestMapping(value = "/pageMgtShopCertificate", method = RequestMethod.POST) + @ApiOperation(value = "平台获取商户证书审核列表") + public R<Page<MgtShopCertificatePageVo>> pageMgtShopCertificate(@RequestBody MgtShopCertificatePageDto mgtShopCertificatePageDto) { + Long userId = SecurityUtils.getUserId(); + mgtShopCertificatePageDto.setUserId(userId); + Page<MgtShopCertificatePageVo> page = new Page<>(); + page.setSize(mgtShopCertificatePageDto.getPageSize()); + page.setCurrent(mgtShopCertificatePageDto.getPageNum()); + List<MgtShopCertificatePageVo> mgtShopCertificatePageVoList = shopCertificateService.pageMgtShopCertificate(page,mgtShopCertificatePageDto); + return R.ok(page.setRecords(mgtShopCertificatePageVoList)); + } + + @RequestMapping(value = "/mgtAuditShopCertificate", method = RequestMethod.POST) + @ApiOperation(value = "平台编辑会员建议标签") + public R mgtAuditShopCertificate(@RequestBody MgtAuditShopCertificateDto mgtAuditShopCertificateDto) { + Long userId = SecurityUtils.getUserId(); + mgtAuditShopCertificateDto.setUserId(userId); + shopCertificateService.mgtAuditShopCertificate(mgtAuditShopCertificateDto); + return R.ok(); + } + + @RequestMapping(value = "/pageMgtShopByCityCode", method = RequestMethod.POST) + @ApiOperation(value = "通过市code分页获取商户列表") + public R<Page<MgtSimpleShopVo>> pageMgtShopByCityCode(@RequestBody MgtShopByCodePageDto mgtShopByCodePageDto) { + Page<MgtSimpleShopVo> page = new Page<>(); + page.setSize(mgtShopByCodePageDto.getPageSize()); + page.setCurrent(mgtShopByCodePageDto.getPageNum()); + List<MgtSimpleShopVo> mgtSimpleShopVoList = shopService.pageMgtShopByCityCode(page,mgtShopByCodePageDto); + return R.ok(page.setRecords(mgtSimpleShopVoList)); + } + + @RequestMapping(value = "/pageMgtShopAuth", method = RequestMethod.POST) + @ApiOperation(value = "分页获取商户进件列表") + public R<Page<MgtShopAuthPageVo>> pageMgtShopAuth(@RequestBody MgtShopAuthPageDto mgtShopAuthPageDto) { + Page<MgtShopAuthPageVo> page = new Page<>(); + page.setSize(mgtShopAuthPageDto.getPageSize()); + page.setCurrent(mgtShopAuthPageDto.getPageNum()); + List<MgtShopAuthPageVo> mgtShopAuthPageVoList = shopService.pageMgtShopAuth(page,mgtShopAuthPageDto); + return R.ok(page.setRecords(mgtShopAuthPageVoList)); + } } -- Gitblit v1.7.1