From c5d38d650d2ac4101b1293a4f17346e7d5420076 Mon Sep 17 00:00:00 2001
From: huliguo <2023611923@qq.com>
Date: 星期五, 04 七月 2025 20:39:58 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/2.0' into 2.0
---
ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/service/impl/shop/ShopStaffServiceImpl.java | 81 +++++++++++++++++++++++++++++++++++-----
1 files changed, 70 insertions(+), 11 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 373be58..7d46d76 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
@@ -4,16 +4,20 @@
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.StringUtils;
import com.ruoyi.common.core.utils.bean.BeanUtils;
-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.domain.dto.AppEditUserDto;
+import com.ruoyi.system.api.domain.dto.CodeGetDto;
import com.ruoyi.system.api.domain.dto.MerEditUserDto;
+import com.ruoyi.system.api.domain.dto.MgtShopStaffEditDto;
import com.ruoyi.system.api.domain.poji.shop.Shop;
import com.ruoyi.system.api.domain.vo.MerStaffInfoVo;
+import com.ruoyi.system.api.service.RemoteFileService;
+import com.ruoyi.system.api.service.RemoteSysStaffService;
+import com.ruoyi.system.api.service.RemoteUserService;
import org.springframework.stereotype.Service;
import javax.annotation.Resource;
@@ -29,12 +33,18 @@
@Service
public class ShopStaffServiceImpl extends ServiceImpl<ShopStaffMapper, ShopStaff> implements ShopStaffService {
- @Resource
- private ShopService shopService;
@Resource
- private ShopRelUserService shopRelUserService;
+ private ShopStaffMapper shopStaffMapper;
+ @Resource
+ private RemoteUserService remoteUserService;
+
+ @Resource
+ private RemoteSysStaffService remoteSysStaffService;
+
+ @Resource
+ private RemoteFileService remoteFileService;
/**
*
* @param userId
@@ -66,24 +76,32 @@
* @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());
-
+ if(StringUtils.isNotBlank(shop.getShopCode())){
+ merStaffInfoVo.setShopCodeUrl(shop.getShopCode());
+ }else{
+ CodeGetDto codeGetDto = new CodeGetDto();
+ String url = "https://wxapp.hhhrt.cn/mini/shop?id="+shop.getShopId();
+ codeGetDto.setUrl(url);
+ codeGetDto.setFileName("shop-"+shop.getShopId());
+ String codeUrl = remoteFileService.getAppOrderTotal(codeGetDto).getData();
+ merStaffInfoVo.setShopCodeUrl(codeUrl);
+ shopStaffMapper.updateShopCodeUrl(shop.getShopId(),codeUrl);
+ }
return merStaffInfoVo;
}
/**
- *
+ * 编辑商户员工信息
* @param merEditUserDto
*/
@Override
@@ -107,5 +125,46 @@
break;
}
this.saveOrUpdate(shopStaff);
+ //同步修改系统用户表
+ AppEditUserDto appEditUserDto = new AppEditUserDto();
+ appEditUserDto.setEditType(merEditUserDto.getEditType());
+ appEditUserDto.setEditValue(merEditUserDto.getEditValue());
+ appEditUserDto.setUserId(merEditUserDto.getUserId());
+ remoteUserService.editUserInfo(appEditUserDto);
+ //同步修改平台员工表
+ remoteSysStaffService.editUserInfo(merEditUserDto);
+ }
+
+ /**
+ * 清空商户员工关联
+ * @param shopId
+ */
+ @Override
+ public void clearShopStaffRelation(Long shopId){
+ shopStaffMapper.clearShopStaffRelation(shopId);
+ }
+
+ /**
+ * @description 修改商户员工信息
+ * @author jqs
+ * @date 2023/7/19 19:03
+ * @param mgtShopStaffEditDto
+ * @return void
+ */
+ @Override
+ public void editMgtShopStaff(MgtShopStaffEditDto mgtShopStaffEditDto){
+ ShopStaff shopStaff = this.getByUserId(mgtShopStaffEditDto.getUserId());
+ if(shopStaff!=null){
+ if(StringUtils.isNotBlank(mgtShopStaffEditDto.getStaffName())){
+ shopStaff.setStaffName(mgtShopStaffEditDto.getStaffName());
+ }
+ if(StringUtils.isNotBlank(mgtShopStaffEditDto.getStaffMobile())){
+ shopStaff.setStaffMobile(mgtShopStaffEditDto.getStaffMobile());
+ }
+ if(StringUtils.isNotBlank(mgtShopStaffEditDto.getStaffAvatar())){
+ shopStaff.setStaffAvatar(mgtShopStaffEditDto.getStaffAvatar());
+ }
+ this.saveOrUpdate(shopStaff);
+ }
}
}
--
Gitblit v1.7.1