From 1c3b9ecea77b913a9ce70ede8ddbb4bcea998b71 Mon Sep 17 00:00:00 2001
From: jiangqs <jiangqs>
Date: 星期三, 10 五月 2023 15:15:34 +0800
Subject: [PATCH] DEMO初步完成

---
 ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/service/impl/shop/ShopStaffServiceImpl.java |   21 +++++++++++++++++++++
 1 files changed, 21 insertions(+), 0 deletions(-)

diff --git a/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/service/impl/shop/ShopStaffServiceImpl.java b/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/service/impl/shop/ShopStaffServiceImpl.java
index 5c024b6..980cd74 100644
--- a/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/service/impl/shop/ShopStaffServiceImpl.java
+++ b/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/service/impl/shop/ShopStaffServiceImpl.java
@@ -6,12 +6,21 @@
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.ruoyi.common.core.utils.bean.BeanUtils;
 import com.ruoyi.shop.domain.pojo.shop.ShopRelTag;
+import com.ruoyi.shop.domain.pojo.shop.ShopRelUser;
 import com.ruoyi.shop.domain.pojo.shop.ShopStaff;
 import com.ruoyi.shop.mapper.shop.ShopStaffMapper;
+import com.ruoyi.shop.service.shop.ShopRelUserService;
+import com.ruoyi.shop.service.shop.ShopService;
 import com.ruoyi.shop.service.shop.ShopStaffService;
+import com.ruoyi.system.api.RemoteMemberService;
 import com.ruoyi.system.api.domain.dto.MerEditUserDto;
+import com.ruoyi.system.api.domain.poji.member.Member;
+import com.ruoyi.system.api.domain.poji.shop.Shop;
 import com.ruoyi.system.api.domain.vo.MerStaffInfoVo;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
 
 /**
  * <p>
@@ -24,6 +33,11 @@
 @Service
 public class ShopStaffServiceImpl extends ServiceImpl<ShopStaffMapper, ShopStaff> implements ShopStaffService {
 
+    @Resource
+    private ShopService shopService;
+
+    @Resource
+    private ShopRelUserService shopRelUserService;
     /**
      *
      * @param userId
@@ -47,6 +61,13 @@
         MerStaffInfoVo merStaffInfoVo = new MerStaffInfoVo();
         ShopStaff shopStaff = this.getByUserId(userId);
         BeanUtils.copyProperties(shopStaff,merStaffInfoVo);
+        ShopRelUser shopRelUser = shopRelUserService.getByUserId(userId);
+        Shop shop = shopService.getByShopId(shopRelUser.getShopId());
+        merStaffInfoVo.setShopName(shop.getShopName());
+        merStaffInfoVo.setShopAddress(shop.getShopAddress());
+        merStaffInfoVo.setShopServicePhone(shop.getShopServicePhone());
+        merStaffInfoVo.setBusinessTime(shop.getBusinessStartTime()+"-"+shop.getBusinessEndTime());
+        merStaffInfoVo.setShopType(shop.getShopType());
         return merStaffInfoVo;
     }
 

--
Gitblit v1.7.1