From c5a96f35ff17e71a330fd391bc3866cead3d13b4 Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期三, 14 八月 2024 15:59:42 +0800
Subject: [PATCH] 充电桩权限管理
---
ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/TOrderEvaluateServiceImpl.java | 48 +++++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 45 insertions(+), 3 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 1c27a8a..44f75a0 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
@@ -3,6 +3,10 @@
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.ruoyi.account.api.feignClient.AppUserCarClient;
+import com.ruoyi.account.api.feignClient.AppUserClient;
+import com.ruoyi.account.api.model.TAppUser;
+import com.ruoyi.account.api.model.TAppUserCar;
import com.ruoyi.account.api.feignClient.AppUserClient;
import com.ruoyi.account.api.model.TAppUser;
import com.ruoyi.chargingPile.api.feignClient.SiteClient;
@@ -14,6 +18,7 @@
import com.ruoyi.order.api.model.TOrderEvaluate;
import com.ruoyi.order.api.model.TOrderEvaluateTag;
import com.ruoyi.order.api.query.TOrderEvaluateQuery;
+import com.ruoyi.order.api.vo.SiteDetailEvaluateVO;
import com.ruoyi.order.api.vo.TOrderEvaluateVO;
import com.ruoyi.order.dto.GetOrderEvaluatePageList;
import com.ruoyi.order.dto.GetOrderEvaluatePageListDTO;
@@ -28,11 +33,13 @@
import org.springframework.stereotype.Service;
import org.springframework.util.CollectionUtils;
+import java.math.BigDecimal;
import javax.annotation.Resource;
import java.util.Arrays;
import java.util.Comparator;
import java.util.List;
import java.util.Map;
+import java.util.Objects;
import java.util.stream.Collectors;
/**
@@ -49,12 +56,13 @@
@Resource
private TEvaluationTagClient evaluationTagClient;
@Resource
+ private AppUserClient appUserClient;
+ @Autowired
+ private AppUserCarClient appUserCarClient;
+ @Autowired
private TOrderEvaluateTagMapper orderEvaluateTagMapper;
@Resource
private TChargingOrderMapper chargingOrderMapper;
-
- @Resource
- private AppUserClient appUserClient;
@Resource
private SiteClient siteClient;
@@ -70,6 +78,8 @@
+ @Autowired
+ private TOrderEvaluateMapper orderEvaluateMapper;
@Override
public List<TEvaluationTagVO> getTagCount() {
// 查询标签列表
@@ -111,10 +121,42 @@
List<Long> orderIds = tChargingOrders.stream().map(TChargingOrder::getId).collect(Collectors.toList());
query.setOrderIds(orderIds);
List<TOrderEvaluateVO> list = this.baseMapper.pageList(query,pageInfo);
+ // 查询用户信息
+ List<TAppUser> appUsers = appUserClient.getUserByIds(list.stream().map(TOrderEvaluateVO::getAppUserId).collect(Collectors.toList())).getData();
+ // 查询用户绑定车辆品牌
+ List<TAppUserCar> appUserCars = appUserCarClient.getCarByIds(list.stream().map(TOrderEvaluateVO::getAppUserCarId).collect(Collectors.toList())).getData();
+ list.forEach(orderEvaluateVO -> {
+ TAppUser appUser = appUsers.stream().filter(user -> user.getId().equals(orderEvaluateVO.getAppUserId())).findFirst().orElse(null);
+ if(Objects.nonNull(appUser)){
+ 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());
+ }
+ });
pageInfo.setRecords(list);
return pageInfo;
}
+ @Override
+ public SiteDetailEvaluateVO getSiteDetailEveList(Integer siteId) {
+ SiteDetailEvaluateVO siteDetailEvaluateVO = new SiteDetailEvaluateVO();
+ // 查询站点下的所有订单评价
+ List<TOrderEvaluateVO> tChargingOrders = orderEvaluateMapper.getOrderEvaluateBySiteId(siteId);
+ if(!CollectionUtils.isEmpty(tChargingOrders)){
+ siteDetailEvaluateVO.setOrderEvaluateVOS(tChargingOrders);
+ // 统计好评率
+ long goodCount = tChargingOrders.stream().filter(orderEvaluateVO -> orderEvaluateVO.getMark()>=4).count();
+ BigDecimal reviewRate = new BigDecimal(goodCount).divide(new BigDecimal(tChargingOrders.size())).setScale(2, BigDecimal.ROUND_HALF_UP);
+ siteDetailEvaluateVO.setReviewRate(reviewRate);
+ siteDetailEvaluateVO.setEvaluateCount(tChargingOrders.size());
+ siteDetailEvaluateVO.setOrderEvaluateVOS(tChargingOrders.stream().limit(3).collect(Collectors.toList()));
+ }
+ return siteDetailEvaluateVO;
+ }
+
/**
* 统计有图，好评，中差评数量
* @param count
--
Gitblit v1.7.1