From 7daaf245531a944bf9ea737e8a1c2d6fda51c10c Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期一, 28 十月 2024 16:00:41 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/TOrderEvaluateServiceImpl.java | 29 ++++++++++++++++++++---------
1 files changed, 20 insertions(+), 9 deletions(-)
diff --git a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/TOrderEvaluateServiceImpl.java b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/TOrderEvaluateServiceImpl.java
index b0b28a0..4b95825 100644
--- a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/TOrderEvaluateServiceImpl.java
+++ b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/TOrderEvaluateServiceImpl.java
@@ -129,6 +129,8 @@
counts.forEach(count -> {
if (tag.getId().equals(count.getId())) {
tag.setTagCount(count.getTagCount());
+ }else{
+ tag.setTagCount(0);
}
});
}else{
@@ -139,14 +141,15 @@
tagList = tagList.stream().sorted(Comparator.comparing(TEvaluationTagVO::getTagCount).reversed()).collect(Collectors.toList());
// 统计有图，好评，中差评数量
long imgUrlCount = this.count(Wrappers.lambdaQuery(TOrderEvaluate.class)
- .isNotNull(TOrderEvaluate::getImgUrl));
- packageTagCount(imgUrlCount,"有图",tagList);
+ .isNotNull(TOrderEvaluate::getImgUrl)
+ .ne(TOrderEvaluate::getImgUrl,""));
+ packageTagCount(imgUrlCount,"有图",2,tagList);
long goodCount = this.count(Wrappers.lambdaQuery(TOrderEvaluate.class)
.ge(TOrderEvaluate::getMark,4));
- packageTagCount(goodCount,"好评",tagList);
+ packageTagCount(goodCount,"好评",3,tagList);
long badCount = this.count(Wrappers.lambdaQuery(TOrderEvaluate.class)
.le(TOrderEvaluate::getMark,3));
- packageTagCount(badCount,"中差评",tagList);
+ packageTagCount(badCount,"中差评",4,tagList);
return tagList;
}
@@ -172,9 +175,11 @@
orderEvaluateVO.setName(appUser.getName());
orderEvaluateVO.setAvatar(appUser.getAvatar());
}
- TAppUserCar appUserCar = appUserCars.stream().filter(car -> car.getId().equals(Long.parseLong(String.valueOf(orderEvaluateVO.getAppUserCarId())))).findFirst().orElse(null);
- if(Objects.nonNull(appUserCar)){
- orderEvaluateVO.setCarName(appUserCar.getVehicleBrand());
+ if(Objects.nonNull(orderEvaluateVO.getAppUserCarId())){
+ TAppUserCar appUserCar = appUserCars.stream().filter(car -> car.getId().equals(Long.parseLong(String.valueOf(orderEvaluateVO.getAppUserCarId())))).findFirst().orElse(null);
+ if(Objects.nonNull(appUserCar)){
+ orderEvaluateVO.setCarName(appUserCar.getVehicleBrand());
+ }
}
});
pageInfo.setRecords(list);
@@ -206,6 +211,11 @@
List<TEvaluationTag> data = evaluationTagClient.getListByIds(tagIds).getData();
tOrderEvaluateVO.setOrderEvaluateTags(data);
}
+ TAppUser data = appUserClient.getUserById(tOrderEvaluateVO.getAppUserId()).getData();
+ if(Objects.nonNull(data)){
+ tOrderEvaluateVO.setName(data.getName());
+ tOrderEvaluateVO.setAvatar(data.getAvatar());
+ }
}
}
siteDetailEvaluateVO.setOrderEvaluateVOS(collect);
@@ -219,11 +229,12 @@
* @param name
* @param tagList
*/
- private void packageTagCount(Long count,String name,List<TEvaluationTagVO> tagList){
+ private void packageTagCount(Long count,String name,Integer type,List<TEvaluationTagVO> tagList){
if(count>0){
TEvaluationTagVO evaluationTagVO = new TEvaluationTagVO();
evaluationTagVO.setName(name);
evaluationTagVO.setTagCount(Integer.parseInt(String.valueOf(count)));
+ evaluationTagVO.setType(type);
tagList.add(evaluationTagVO);
}
}
@@ -371,7 +382,7 @@
* @return
*/
@Override
- public OrderEvaluateVo getOrderEvaluate(Integer orderId, Integer orderType) {
+ public OrderEvaluateVo getOrderEvaluate(String orderId, Integer orderType) {
TOrderEvaluate orderEvaluate = this.getOne(new LambdaQueryWrapper<TOrderEvaluate>().eq(TOrderEvaluate::getOrderId, orderId).eq(TOrderEvaluate::getOrderType, orderType));
if(null != orderEvaluate){
OrderEvaluateVo orderEvaluateVo = new OrderEvaluateVo();
--
Gitblit v1.7.1