From 92da9546e1b37b06f78671b34389b1dec9dfadfc Mon Sep 17 00:00:00 2001
From: jiangqs <jiangqs>
Date: 星期二, 06 六月 2023 13:57:42 +0800
Subject: [PATCH] 基础配置
---
ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/controller/business/MerShopController.java | 31 ++++++-------------------------
1 files changed, 6 insertions(+), 25 deletions(-)
diff --git a/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/controller/business/MerShopController.java b/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/controller/business/MerShopController.java
index d10738d..d86eb0d 100644
--- a/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/controller/business/MerShopController.java
+++ b/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/controller/business/MerShopController.java
@@ -32,19 +32,18 @@
public class MerShopController {
- @Autowired
+ @Resource
private ShopService shopService;
- @Autowired
+ @Resource
private ShopCertificateService shopCertificateService;
- @Autowired
+ @Resource
private ShopStaffService shopStaffService;
- @Autowired
- private RecommendCooperationService recommendCooperationService;
- @Autowired
+
+ @Resource
private ShopSuggestService shopSuggestService;
/**
@@ -108,30 +107,12 @@
@ApiOperation(value = "修改员工信息")
public R editShopStaffInfo(@RequestBody MerEditUserDto merEditUserDto) {
Long userId = SecurityUtils.getUserId();
+ merEditUserDto.setUserId(userId);
shopStaffService.editShopStaffInfo(merEditUserDto);
return R.ok();
}
- @RequestMapping(value = "/pageMerShopRecommend", method = RequestMethod.POST)
- @ApiOperation(value = "分页获取商户推荐列表")
- public R<Page<MerShopRecommendPageVo>> pageMerShopRecommend(@RequestBody MerShopRecommendPageDto merShopRecommendPageDto) {
- Long userId = SecurityUtils.getUserId();
- merShopRecommendPageDto.setUserId(userId);
- Page<MerShopRecommendPageVo> page = new Page<>();
- page.setSize(merShopRecommendPageDto.getPageSize());
- page.setCurrent(merShopRecommendPageDto.getPageNum());
- List<MerShopRecommendPageVo> merShopRecommendPageVoList = recommendCooperationService.pageMerShopRecommend(page,merShopRecommendPageDto);
- return R.ok(page.setRecords(merShopRecommendPageVoList));
- }
- @RequestMapping(value = "/recommendCooperation", method = RequestMethod.POST)
- @ApiOperation(value = "推荐合作")
- public R recommendCooperation(@RequestBody MerRecommendCooperationDto merRecommendCooperationDto) {
- Long userId = SecurityUtils.getUserId();
- merRecommendCooperationDto.setUserId(userId);
- recommendCooperationService.recommendCooperation(merRecommendCooperationDto);
- return R.ok();
- }
@RequestMapping(value = "/pageMerShopSuggest", method = RequestMethod.POST)
@ApiOperation(value = "分页获取商户建议")
--
Gitblit v1.7.1