From b7f1926cda224190dc7ada09d5b1475a8f267249 Mon Sep 17 00:00:00 2001
From: zhanglin8526 <852614290@qq.com>
Date: 星期三, 10 五月 2023 13:48:40 +0800
Subject: [PATCH] 提交登录获取shopId
---
ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/vo/MerStaffInfoVo.java | 6 ++++++
ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/service/impl/shop/ShopStaffServiceImpl.java | 7 +++++++
2 files changed, 13 insertions(+), 0 deletions(-)
diff --git a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/vo/MerStaffInfoVo.java b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/vo/MerStaffInfoVo.java
index d34b1ec..7ed2f08 100644
--- a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/vo/MerStaffInfoVo.java
+++ b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/vo/MerStaffInfoVo.java
@@ -45,12 +45,18 @@
@ApiModelProperty(value = "商户名称")
private String shopName;
+ @ApiModelProperty(value = "商户编号")
+ private String shopNumber;
+
@ApiModelProperty(value = "商户地址")
private String shopAddress;
@ApiModelProperty(value = "商户电话")
private String shopServicePhone;
+ @ApiModelProperty(value = "员工头像")
+ private String staffAvatar;
+
@ApiModelProperty(value = "商户营业时间")
private String businessTime;
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 2e21710..0b50571 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,6 +1,7 @@
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;
@@ -8,6 +9,7 @@
import com.ruoyi.shop.domain.pojo.shop.ShopRelTag;
import com.ruoyi.shop.domain.pojo.shop.ShopStaff;
import com.ruoyi.shop.mapper.shop.ShopStaffMapper;
+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;
@@ -30,6 +32,8 @@
@Service
public class ShopStaffServiceImpl extends ServiceImpl<ShopStaffMapper, ShopStaff> implements ShopStaffService {
+ @Autowired
+ private ShopService shopService;
/**
*
@@ -55,6 +59,9 @@
ShopStaff shopStaff = this.getByUserId(userId);
BeanUtils.copyProperties(shopStaff,merStaffInfoVo);
+ Shop shop = shopService.getByShopId(shopStaff.getShopId());
+ merStaffInfoVo.setShopNumber(shop.getShopNumber());
+
return merStaffInfoVo;
}
--
Gitblit v1.7.1