From d6c8f09fd628bd0111de4ee7071844465df9adb1 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期一, 28 十月 2024 18:57:35 +0800
Subject: [PATCH] Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/mx_charging_pile
---
ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/TOrderEvaluateServiceImpl.java | 31 +++++++++++++++++++++----------
1 files changed, 21 insertions(+), 10 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 78d1c96..f216c5c 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
@@ -139,14 +139,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 +173,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 +209,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 +227,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);
}
}
@@ -347,6 +356,7 @@
appUser.setPoints(appUser.getPoints() + num1);
appUserClient.updateAppUser(appUser);
+ TChargingOrder chargingOrder = chargingOrderService.getById(orderEvaluate.getOrderId());
//积分变动明细
TAppUserIntegralChange appUserIntegralChange = new TAppUserIntegralChange();
appUserIntegralChange.setAppUserId(appUser.getId());
@@ -354,7 +364,8 @@
appUserIntegralChange.setHistoricalIntegral(points);
appUserIntegralChange.setCurrentIntegral(points + num1);
appUserIntegralChange.setCreateTime(LocalDateTime.now());
- appUserIntegralChange.setOrderCode(orderEvaluate.getId().toString());
+ appUserIntegralChange.setOrderCode(chargingOrder.getCode());
+ appUserIntegralChange.setExtension(orderEvaluate.getOrderId().toString());
appUserIntegralChangeClient.addAppUserIntegralChange(appUserIntegralChange);
}
}
@@ -369,7 +380,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