From 69f4e7bafd3d81696aa00affd6b9ddfa6b50503f Mon Sep 17 00:00:00 2001
From: luodangjia <luodangjia>
Date: 星期六, 08 二月 2025 13:36:29 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/service/impl/TechnicianServiceImpl.java | 46 ++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 46 insertions(+), 0 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 ead8ae5..a47544b 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,10 +1,23 @@
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.List;
/**
* <p>
@@ -16,5 +29,38 @@
*/
@Service
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, String name,Integer point) {
+ return technicianMapper.selectTechnicianListByShopId(shopId,name,point);
+ }
+
+ @Override
+ public TechnicianDetailVO technicianDetail(Long 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