From 046d7ac5bbef4cbb6c6b64f3589e2722d13a07a5 Mon Sep 17 00:00:00 2001
From: jiangqs <jiangqs>
Date: 星期二, 27 六月 2023 11:00:01 +0800
Subject: [PATCH] 日志管理
---
ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/service/impl/shop/ShopStaffServiceImpl.java | 41 ++++++++++++++++++++++++++---------------
1 files changed, 26 insertions(+), 15 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 d3d3772..0ba38ed 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
@@ -5,19 +5,12 @@
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
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;
@@ -33,11 +26,9 @@
@Service
public class ShopStaffServiceImpl extends ServiceImpl<ShopStaffMapper, ShopStaff> implements ShopStaffService {
- @Resource
- private ShopService shopService;
@Resource
- private ShopRelUserService shopRelUserService;
+ private ShopStaffMapper shopStaffMapper;
/**
*
@@ -51,6 +42,18 @@
return this.getOne(queryWrapper,false);
}
+ /**
+ * 通过手机号获取商户员工
+ * @param mobile
+ * @return
+ */
+ @Override
+ public ShopStaff getByMobile(String mobile){
+ LambdaQueryWrapper<ShopStaff> queryWrapper = Wrappers.lambdaQuery();
+ queryWrapper.eq(ShopStaff::getDelFlag, 0).eq(ShopStaff::getStaffMobile, mobile);
+ return this.getOne(queryWrapper,false);
+ }
+
/**
* 获取商户员工信息
@@ -58,24 +61,21 @@
* @return
*/
@Override
- public MerStaffInfoVo getShopStaffInfo(Long userId){
+ public MerStaffInfoVo getShopStaffInfo(Long userId,Shop shop){
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());
merStaffInfoVo.setShopNumber(shop.getShopNumber());
-
return merStaffInfoVo;
}
/**
- *
+ * 编辑商户员工信息
* @param merEditUserDto
*/
@Override
@@ -95,7 +95,18 @@
case 4:
shopStaff.setStaffBirthday(merEditUserDto.getEditValue());
break;
+ default:
+ break;
}
this.saveOrUpdate(shopStaff);
}
+
+ /**
+ * 清空商户员工关联
+ * @param shopId
+ */
+ @Override
+ public void clearShopStaffRelation(Long shopId){
+ shopStaffMapper.clearShopStaffRelation(shopId);
+ }
}
--
Gitblit v1.7.1