From 6b3aba3c9000a7bd77f10b3007702347f8c1d401 Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期三, 15 一月 2025 09:29:06 +0800
Subject: [PATCH] 修改bug
---
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysUserController.java | 21 ++++++++++++---------
ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/service/impl/TechnicianSubscribeServiceImpl.java | 21 ++++++++++++++++-----
ruoyi-service/ruoyi-other/src/main/resources/mapper/other/TechnicianSubscribeMapper.xml | 1 +
3 files changed, 29 insertions(+), 14 deletions(-)
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysUserController.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysUserController.java
index 8ffd2ff..daa57b8 100644
--- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysUserController.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysUserController.java
@@ -172,15 +172,18 @@
}
//添加门店员工关系数据
- UserShop userShop = new UserShop();
- userShop.setUserId(one.getUserId());
- userShop.setShopId(sysUser1.getObjectId());
- userShop.setRoleType(2);
- userShop.setRoleId(user.getRoleId());
- userShop.setDeptId(user.getDeptId());
- userShop.setNickName(user.getNickName());
- userShop.setCreateTime(LocalDateTime.now());
- userShopService.save(userShop);
+ UserShop one1 = userShopService.getOne(new LambdaQueryWrapper<UserShop>().eq(UserShop::getUserId, one.getUserId()).eq(UserShop::getShopId, sysUser1.getObjectId()));
+ if(null == one1){
+ UserShop userShop = new UserShop();
+ userShop.setUserId(one.getUserId());
+ userShop.setShopId(sysUser1.getObjectId());
+ userShop.setRoleType(2);
+ userShop.setRoleId(user.getRoleId());
+ userShop.setDeptId(user.getDeptId());
+ userShop.setNickName(user.getNickName());
+ userShop.setCreateTime(LocalDateTime.now());
+ userShopService.save(userShop);
+ }
}else{
user.setCreateBy(SecurityUtils.getUsername());
user.setPassword(SecurityUtils.encryptPassword("a123456"));
diff --git a/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/service/impl/TechnicianSubscribeServiceImpl.java b/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/service/impl/TechnicianSubscribeServiceImpl.java
index 193e2f6..951f527 100644
--- a/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/service/impl/TechnicianSubscribeServiceImpl.java
+++ b/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/service/impl/TechnicianSubscribeServiceImpl.java
@@ -1,5 +1,6 @@
package com.ruoyi.other.service.impl;
+import com.alibaba.fastjson2.JSON;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -8,6 +9,7 @@
import com.ruoyi.account.api.feignClient.AppUserShopClient;
import com.ruoyi.account.api.model.AppUser;
import com.ruoyi.account.api.model.AppUserShop;
+import com.ruoyi.account.api.model.UserAddress;
import com.ruoyi.common.core.utils.StringUtils;
import com.ruoyi.common.core.web.page.PageInfo;
import com.ruoyi.common.security.service.TokenService;
@@ -70,11 +72,15 @@
Optional<AppUserShop> first = data.stream().filter(s -> s.getShopId() == shopId.intValue() && s.getRoleType() == 3).findFirst();
Integer technicianId = null;
if(first.isPresent()){
- AppUserShop appUserShop = first.get();
- Technician technician = technicianService.getOne(new LambdaQueryWrapper<Technician>().eq(Technician::getAppUserId, appUserShop.getAppUserId())
- .eq(Technician::getShopId, appUserShop.getShopId()).eq(Technician::getDelFlag, 0).eq(Technician::getStatus, 2));
- if(null != technician){
- technicianId = technician.getId();
+ //既是店员又是技师，需要取员工身份获取列表数据
+ Optional<AppUserShop> first1 = data.stream().filter(s -> s.getShopId() == shopId.intValue() && s.getRoleType() != 3).findFirst();
+ if(!first1.isPresent()){
+ AppUserShop appUserShop = first.get();
+ Technician technician = technicianService.getOne(new LambdaQueryWrapper<Technician>().eq(Technician::getAppUserId, appUserShop.getAppUserId())
+ .eq(Technician::getShopId, appUserShop.getShopId()).eq(Technician::getDelFlag, 0).eq(Technician::getStatus, 2));
+ if(null != technician){
+ technicianId = technician.getId();
+ }
}
}
List<TechnicianSubscribeVO> list = technicianSubscribeMapper.getTechnicianSubscribeByUserAndShop(pageInfo, shopId, status, technicianId);
@@ -84,6 +90,11 @@
AppUser appUser = appUserClient.getAppUserById(technicianSubscribe.getAppUserId());
technicianSubscribeVO.setUserName(appUser.getName());
technicianSubscribeVO.setPhone(appUser.getPhone());
+ Integer serviceMode = technicianSubscribeVO.getServiceMode();
+ if(1 == serviceMode){
+ UserAddress userAddress = JSON.parseObject(technicianSubscribeVO.getUserAddress(), UserAddress.class);
+ technicianSubscribeVO.setUserAddress(userAddress.getProvince() + userAddress.getCity() + userAddress.getDistrict() + userAddress.getRecieveAddress());
+ }
}
return pageInfo.setRecords(list);
}
diff --git a/ruoyi-service/ruoyi-other/src/main/resources/mapper/other/TechnicianSubscribeMapper.xml b/ruoyi-service/ruoyi-other/src/main/resources/mapper/other/TechnicianSubscribeMapper.xml
index d8da8e6..f94d1c9 100644
--- a/ruoyi-service/ruoyi-other/src/main/resources/mapper/other/TechnicianSubscribeMapper.xml
+++ b/ruoyi-service/ruoyi-other/src/main/resources/mapper/other/TechnicianSubscribeMapper.xml
@@ -13,6 +13,7 @@
ts.latitude,
tts.subscribe_time,
tts.service_mode,
+ tts.user_address,
tts.status
FROM
t_technician_subscribe tts
--
Gitblit v1.7.1