From c203ff63489126a94d1be5dbfe32cadb69a70594 Mon Sep 17 00:00:00 2001
From: jiangqs <jiangqs>
Date: 星期四, 25 五月 2023 16:26:56 +0800
Subject: [PATCH] 完善数据库和框架
---
ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/service/impl/shop/ShopStaffServiceImpl.java | 35 +++++++++++++++++++++++++++--------
1 files changed, 27 insertions(+), 8 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 0b50571..373be58 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
@@ -1,22 +1,19 @@
package com.ruoyi.shop.service.impl.shop;
-import com.alibaba.nacos.shaded.org.checkerframework.checker.units.qual.A;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
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;
@@ -32,8 +29,11 @@
@Service
public class ShopStaffServiceImpl extends ServiceImpl<ShopStaffMapper, ShopStaff> implements ShopStaffService {
- @Autowired
+ @Resource
private ShopService shopService;
+
+ @Resource
+ private ShopRelUserService shopRelUserService;
/**
*
@@ -44,6 +44,18 @@
public ShopStaff getByUserId(Long userId){
LambdaQueryWrapper<ShopStaff> queryWrapper = Wrappers.lambdaQuery();
queryWrapper.eq(ShopStaff::getDelFlag, 0).eq(ShopStaff::getUserId, userId);
+ 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,8 +70,13 @@
MerStaffInfoVo merStaffInfoVo = new MerStaffInfoVo();
ShopStaff shopStaff = this.getByUserId(userId);
BeanUtils.copyProperties(shopStaff,merStaffInfoVo);
-
- Shop shop = shopService.getByShopId(shopStaff.getShopId());
+ 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;
@@ -86,6 +103,8 @@
case 4:
shopStaff.setStaffBirthday(merEditUserDto.getEditValue());
break;
+ default:
+ break;
}
this.saveOrUpdate(shopStaff);
}
--
Gitblit v1.7.1