From ec6d43aa07ee0e8faf34498057ebcfbb446aa015 Mon Sep 17 00:00:00 2001
From: hjl <1657978663@qq.com>
Date: 星期二, 16 七月 2024 09:21:51 +0800
Subject: [PATCH] feat: 代码重构
---
ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/controller/MasterWorkerController.java | 27 ++++++++++++---------------
1 files changed, 12 insertions(+), 15 deletions(-)
diff --git a/ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/controller/MasterWorkerController.java b/ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/controller/MasterWorkerController.java
index 4820535..196eb28 100644
--- a/ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/controller/MasterWorkerController.java
+++ b/ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/controller/MasterWorkerController.java
@@ -4,15 +4,15 @@
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.conditions.query.LambdaQueryChainWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.ruoyi.admin.entity.Evaluate;
import com.ruoyi.admin.entity.MasterWorker;
-import com.ruoyi.admin.service.EvaluateService;
import com.ruoyi.admin.service.MasterWorkerService;
import com.ruoyi.admin.vo.MasterWorkerDetailVO;
import com.ruoyi.common.core.constant.Constants;
import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.core.utils.StringUtils;
import com.ruoyi.common.core.utils.bean.BeanUtils;
+import com.ruoyi.order.api.entity.Evaluate;
+import com.ruoyi.order.api.feignClient.EvaluateClient;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams;
@@ -23,7 +23,6 @@
import javax.annotation.Resource;
import java.math.BigDecimal;
-import java.math.RoundingMode;
import java.util.Arrays;
import java.util.List;
import java.util.stream.Collectors;
@@ -44,7 +43,7 @@
@Resource
private MasterWorkerService masterWorkerService;
@Resource
- private EvaluateService evaluateService;
+ private EvaluateClient evaluateClient;
/**
* 师傅列表分页查询 (添加订单-选择师傅列表)
@@ -52,18 +51,18 @@
@ApiOperation(value = "师傅列表", tags = {"后台-师傅管理"})
@GetMapping(value = "/selectServe")
@ApiImplicitParams({
- @ApiImplicitParam(value = "师傅姓名", name = "name", dataType = "String"),
+ @ApiImplicitParam(value = "师傅姓名", name = "workerName", dataType = "String"),
@ApiImplicitParam(value = "师傅电话", name = "phone", dataType = "String"),
@ApiImplicitParam(value = "服务城市", name = "city", dataType = "String"),
@ApiImplicitParam(value = "账号启用状态", name = "state", dataType = "Integer"),
@ApiImplicitParam(value = "页码", name = "pageNum", dataType = "Integer", required = true),
@ApiImplicitParam(value = "每页显示条数", name = "pageSize", dataType = "Integer", required = true)
})
- public R<IPage<MasterWorker>> selectServe(String name, String phone, String city, Integer state,
+ public R<IPage<MasterWorker>> selectServe(String workerName, String phone, String city, Integer state,
@RequestParam(name = "pageNum", defaultValue = "1") Integer pageNum,
@RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize) {
LambdaQueryChainWrapper<MasterWorker> wrapper = masterWorkerService.lambdaQuery();
- wrapper = StringUtils.isNotBlank(name) ? wrapper.like(MasterWorker::getRealName, name) : wrapper;
+ wrapper = StringUtils.isNotBlank(workerName) ? wrapper.like(MasterWorker::getRealName, workerName) : wrapper;
wrapper = StringUtils.isNotBlank(phone) ? wrapper.like(MasterWorker::getPhone, phone) : wrapper;
wrapper = StringUtils.isNotBlank(city) ? wrapper.like(MasterWorker::getCity, city) : wrapper;
if (null != state) {
@@ -81,7 +80,7 @@
@ApiOperation(value = "新增师傅信息", tags = {"后台-师傅管理-师傅列表管理"})
@PostMapping(value = "/save")
public R<String> save(@RequestBody MasterWorker masterWorker) {
- boolean check = masterWorkerService.checkOnlyPhone(masterWorker.getPhone());
+ boolean check = masterWorkerService.checkOnlyPhone(masterWorker.getPhone(), null);
if (check) {
// MD5加密登录密码(新)
BCryptPasswordEncoder passwordEncoder = new BCryptPasswordEncoder();
@@ -118,7 +117,7 @@
@ApiOperation(value = "修改师傅信息", tags = {"后台-师傅管理-师傅列表管理"})
@PostMapping(value = "/update")
public R<String> update(@RequestBody @Validated MasterWorker masterWorker) {
- boolean check = masterWorkerService.checkOnlyPhone(masterWorker.getPhone());
+ boolean check = masterWorkerService.checkOnlyPhone(masterWorker.getPhone(), masterWorker.getId());
if (check) {
return masterWorkerService.updateById(masterWorker) ? R.ok() : R.fail();
} else {
@@ -163,14 +162,12 @@
MasterWorkerDetailVO workerDetail = new MasterWorkerDetailVO();
BeanUtils.copyProperties(worker, workerDetail);
// 计算服务星级
- List<Evaluate> evaluateList = evaluateService.lambdaQuery().eq(Evaluate::getWorkerId, workerId)
- .eq(Evaluate::getIsDelete, 0).list();
- List<BigDecimal> star = evaluateList.stream().map(Evaluate::getStarRating).collect(Collectors.toList());
+ List<Evaluate> evaluateList = evaluateClient.evaluateByWorkerId(worker.getId()).getData();
+ List<Double> star = evaluateList.stream().map(Evaluate::getStarRating).collect(Collectors.toList());
if (!star.isEmpty()) {
// 总评分 / 评价数量
- BigDecimal starRating = star.stream().reduce(BigDecimal.ZERO, BigDecimal::add);
- BigDecimal result = starRating.divide(new BigDecimal(star.size()), 1, RoundingMode.HALF_UP);
- workerDetail.setStarRating(result);
+ double sum = star.stream().mapToDouble(Double::doubleValue).sum();
+ workerDetail.setStarRating(new BigDecimal(sum / star.size()));
}
return R.ok(workerDetail);
}
--
Gitblit v1.7.1