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/business/MerShopController.java |   54 ++++++++++++++++++++++++------------------------------
 1 files changed, 24 insertions(+), 30 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..db66de5 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
@@ -3,20 +3,30 @@
 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.*;
-import com.ruoyi.shop.domain.vo.*;
+import com.ruoyi.shop.domain.dto.MerAgencyPageDto;
+import com.ruoyi.shop.domain.dto.MerShopCertificateEditDto;
+import com.ruoyi.shop.domain.dto.MerShopCertificateListDto;
+import com.ruoyi.shop.domain.dto.MerShopSuggestDto;
+import com.ruoyi.shop.domain.pojo.shop.ShopRelUser;
+import com.ruoyi.shop.domain.vo.MerAgencyPageVo;
+import com.ruoyi.shop.domain.vo.MerShopCertificateListVo;
+import com.ruoyi.shop.domain.vo.MerShopSuggestVo;
 import com.ruoyi.shop.service.shop.*;
-import com.ruoyi.system.api.domain.dto.*;
+import com.ruoyi.system.api.domain.dto.MerBaseDto;
+import com.ruoyi.system.api.domain.dto.MerBaseGetDto;
+import com.ruoyi.system.api.domain.dto.MerEditUserDto;
+import com.ruoyi.system.api.domain.dto.MerPageDto;
+import com.ruoyi.system.api.domain.poji.shop.Shop;
 import com.ruoyi.system.api.domain.vo.MerHomeShopTotalVo;
 import com.ruoyi.system.api.domain.vo.MerStaffInfoVo;
 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,19 +42,19 @@
 public class MerShopController {
 
 
-    @Autowired
+    @Resource
     private ShopService shopService;
 
-    @Autowired
+    @Resource
     private ShopCertificateService shopCertificateService;
 
-    @Autowired
+    @Resource
     private ShopStaffService shopStaffService;
 
-    @Autowired
-    private RecommendCooperationService recommendCooperationService;
+    @Resource
+    private ShopRelUserService shopRelUserService;
 
-    @Autowired
+    @Resource
     private ShopSuggestService shopSuggestService;
 
     /**
@@ -100,7 +110,9 @@
     @ApiOperation(value = "获取员工信息")
     public R<MerStaffInfoVo> getShopStaffInfo() {
         Long userId = SecurityUtils.getUserId();
-        MerStaffInfoVo merStaffInfoVo = shopStaffService.getShopStaffInfo(userId);
+        ShopRelUser shopRelUser = shopRelUserService.getByUserId(userId);
+        Shop shop = shopService.getByShopId(shopRelUser.getShopId());
+        MerStaffInfoVo merStaffInfoVo = shopStaffService.getShopStaffInfo(userId,shop);
         return R.ok(merStaffInfoVo);
     }
 
@@ -108,30 +120,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