From 9142c0ea84b8dd7d190c9f420185eb3ba4edd79c Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期三, 23 十月 2024 13:34:51 +0800
Subject: [PATCH] Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/mx_charging_pile
---
ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/service/impl/SiteServiceImpl.java | 11 ++++++-----
1 files changed, 6 insertions(+), 5 deletions(-)
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 8029ad5..44d5079 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
@@ -38,6 +38,7 @@
import org.springframework.util.CollectionUtils;
import javax.annotation.Resource;
+import java.math.BigDecimal;
import java.util.*;
import java.util.stream.Collectors;
@@ -233,9 +234,9 @@
if(StringUtils.isEmpty(site.getAddress())){
return AjaxResult.error("详细地址不能为空");
}
- if(StringUtils.isEmpty(site.getLon()) || StringUtils.isEmpty(site.getLat())){
- return AjaxResult.error("地图位置不能为空");
- }
+// if(StringUtils.isEmpty(site.getLon()) || StringUtils.isEmpty(site.getLat())){
+// return AjaxResult.error("地图位置不能为空");
+// }
if(StringUtils.isEmpty(site.getPhone())){
return AjaxResult.error("站点电话不能为空");
}
@@ -288,7 +289,7 @@
TVip vip = vipClient.getInfo1(appUser.getVipId()).getData();
if(Objects.nonNull(vip) && vip.getType() == 2){
list.forEach(item -> {
- item.setVipElectrovalence(vip.getDiscount().multiply(item.getServiceCharge()).add(item.getElectrovalenceOriginal()));
+ item.setVipElectrovalence(vip.getDiscount().divide(new BigDecimal(10)).multiply(item.getServiceCharge()).add(item.getElectrovalenceOriginal()));
});
}
}
@@ -370,7 +371,7 @@
TVip vip = vipClient.getInfo1(appUser.getVipId()).getData();
if(Objects.nonNull(vip) && vip.getType() == 2){
list.forEach(item -> {
- item.setVipElectrovalence(vip.getDiscount().multiply(item.getElectrovalence()));
+ item.setVipElectrovalence(vip.getDiscount().divide(new BigDecimal(10)).multiply(item.getServiceCharge()).add(item.getElectrovalenceOriginal()));
});
}
}
--
Gitblit v1.7.1