From 3be4f3da80af1a050ebe45a4572daa7b5a490a45 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期一, 28 十月 2024 16:00:30 +0800
Subject: [PATCH] xiugai

---
 ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/TOrderEvaluateServiceImpl.java                 |   11 +++++++----
 ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/controller/TAccountingStrategyController.java |    7 +++++--
 ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/service/impl/SiteServiceImpl.java             |    4 +++-
 3 files changed, 15 insertions(+), 7 deletions(-)

diff --git a/ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/controller/TAccountingStrategyController.java b/ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/controller/TAccountingStrategyController.java
index a4a794b..562043a 100644
--- a/ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/controller/TAccountingStrategyController.java
+++ b/ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/controller/TAccountingStrategyController.java
@@ -361,8 +361,11 @@
                     byId.setSiteId(one.getSiteId());
                     //将site表对应的模板id修改为新的这个
                     Site byId1 = siteService.getById(one.getSiteId());
-                    byId1.setAccountingStrategyId(byId.getId());
-                    siteService.updateById(byId1);
+                    if (byId1!=null) {
+                        byId1.setAccountingStrategyId(byId.getId());
+                        siteService.updateById(byId1);
+                    }
+                    accountingStrategyService.removeById(one.getId());
                 }
                 //硬件
                 List<TChargingPile> list = chargingPileService.lambdaQuery().eq(TChargingPile::getSiteId, byId.getSiteId()).list();
diff --git a/ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/service/impl/SiteServiceImpl.java b/ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/service/impl/SiteServiceImpl.java
index aacf87e..9a33506 100644
--- a/ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/service/impl/SiteServiceImpl.java
+++ b/ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/service/impl/SiteServiceImpl.java
@@ -293,7 +293,9 @@
 			TVip vip = vipClient.getInfo1(appUser.getVipId()).getData();
 			if(Objects.nonNull(vip) && vip.getType() == 2){
 				list.forEach(item -> {
-					item.setVipElectrovalence(vip.getDiscount().divide(new BigDecimal(10)).multiply(item.getServiceCharge()).add(item.getElectrovalenceOriginal()));
+					if(Objects.nonNull(vip.getDiscount())){
+						item.setVipElectrovalence(vip.getDiscount().divide(new BigDecimal(10)).multiply(item.getServiceCharge()).add(item.getElectrovalenceOriginal()));
+					}
 				});
 			}
 		}
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 7bc42c1..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
@@ -141,7 +141,8 @@
         tagList = tagList.stream().sorted(Comparator.comparing(TEvaluationTagVO::getTagCount).reversed()).collect(Collectors.toList());
         // 统计有图,好评,中差评数量
         long imgUrlCount = this.count(Wrappers.lambdaQuery(TOrderEvaluate.class)
-                        .and(e->e.isNotNull(TOrderEvaluate::getImgUrl)).or().ne(TOrderEvaluate::getImgUrl,""));
+                .isNotNull(TOrderEvaluate::getImgUrl)
+                .ne(TOrderEvaluate::getImgUrl,""));
         packageTagCount(imgUrlCount,"有图",2,tagList);
         long goodCount = this.count(Wrappers.lambdaQuery(TOrderEvaluate.class)
                 .ge(TOrderEvaluate::getMark,4));
@@ -174,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);

--
Gitblit v1.7.1