From fe9a9158be179ecf9b5f2033e28ebdeeffef7efe Mon Sep 17 00:00:00 2001
From: phpcjl <phpcjl@gmail.com>
Date: 星期二, 17 十二月 2024 16:32:56 +0800
Subject: [PATCH] 1
---
ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/service/impl/TechnicianServiceImpl.java | 37 +++++++++++++++++++++++++++++++++----
1 files changed, 33 insertions(+), 4 deletions(-)
diff --git a/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/service/impl/TechnicianServiceImpl.java b/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/service/impl/TechnicianServiceImpl.java
index 519f02d..049adcb 100644
--- a/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/service/impl/TechnicianServiceImpl.java
+++ b/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/service/impl/TechnicianServiceImpl.java
@@ -1,15 +1,22 @@
package com.ruoyi.other.service.impl;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.ruoyi.account.api.feignClient.UserAddressClient;
+import com.ruoyi.account.api.model.UserAddress;
+import com.ruoyi.common.core.domain.R;
+import com.ruoyi.common.security.service.TokenService;
+import com.ruoyi.other.api.domain.TechnicianScore;
import com.ruoyi.other.mapper.TechnicianMapper;
import com.ruoyi.other.api.domain.Technician;
+import com.ruoyi.other.service.TechnicianScoreService;
import com.ruoyi.other.service.TechnicianService;
import com.ruoyi.other.vo.TechnicianDetailVO;
import com.ruoyi.other.vo.TechnicianVO;
+import com.ruoyi.system.api.model.LoginUser;
import org.springframework.stereotype.Service;
import javax.annotation.Resource;
-import java.util.Collections;
import java.util.List;
/**
@@ -24,14 +31,36 @@
public class TechnicianServiceImpl extends ServiceImpl<TechnicianMapper, Technician> implements TechnicianService {
@Resource
private TechnicianMapper technicianMapper;
+ @Resource
+ private TokenService tokenService;
+ @Resource
+ private UserAddressClient userAddressClient;
+ @Resource
+ private TechnicianScoreService technicianScoreService;
@Override
- public List<TechnicianVO> getTechnicianListByShopId(Long shopId) {
- return technicianMapper.selectTechnicianListByShopId(shopId);
+ public List<TechnicianVO> getTechnicianListByShopId(Long shopId, String name) {
+ return technicianMapper.selectTechnicianListByShopId(shopId,name);
}
@Override
public TechnicianDetailVO technicianDetail(Long technicianId) {
- return technicianMapper.selectTechnicianDetail(technicianId);
+ LoginUser loginUserApplet = tokenService.getLoginUserApplet();
+ R<UserAddress> defaultUserAddressR = userAddressClient.getDefaultUserAddress(loginUserApplet.getUserid());
+ if (R.isError(defaultUserAddressR)){
+ throw new RuntimeException("获取默认地址失败");
+ }
+ TechnicianDetailVO technicianDetailVO = technicianMapper.selectTechnicianDetail(technicianId);
+ technicianDetailVO.setAddress(defaultUserAddressR.getData());
+
+ TechnicianScore technicianScoreServiceOne = technicianScoreService.getOne(new LambdaQueryWrapper<TechnicianScore>()
+ .eq(TechnicianScore::getAppUserId, loginUserApplet.getUserid())
+ .eq(TechnicianScore::getTechnicianId, technicianId));
+ if (technicianScoreServiceOne != null){
+ technicianDetailVO.setScoreStatus(2);
+ }else {
+ technicianDetailVO.setScoreStatus(1);
+ }
+ return technicianDetailVO;
}
}
--
Gitblit v1.7.1