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 | 25 +++++++++++++++++++------
1 files changed, 19 insertions(+), 6 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 d86eb0d..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;
/**
@@ -41,7 +51,8 @@
@Resource
private ShopStaffService shopStaffService;
-
+ @Resource
+ private ShopRelUserService shopRelUserService;
@Resource
private ShopSuggestService shopSuggestService;
@@ -99,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);
}
--
Gitblit v1.7.1