From c6d740cc264e003152077e85acd9cda15c0415f8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9B=B9=E7=A3=8A?= <45566618@qq.com>
Date: Tue, 16 Jul 2024 15:18:16 +0800
Subject: [PATCH] =?UTF-8?q?=E5=85=8D=E8=B4=B9=E5=85=AC=E9=87=8C=E6=95=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/TravelConfServiceImpl.java           | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/sqx/modules/travelconf/service/impl/TravelConfServiceImpl.java b/src/main/java/com/sqx/modules/travelconf/service/impl/TravelConfServiceImpl.java
index c55106b..5ec2129 100644
--- a/src/main/java/com/sqx/modules/travelconf/service/impl/TravelConfServiceImpl.java
+++ b/src/main/java/com/sqx/modules/travelconf/service/impl/TravelConfServiceImpl.java
@@ -225,6 +225,9 @@ public class TravelConfServiceImpl extends ServiceImpl<TravelConfDao, TravelConf
 	public TravelPriceVo calcTravelPrice(Long artificerId, String toLongitude, String toLatitude, String serveTime, Integer tripWay){
 		Artificer artificerInfo = artificerService.getById(artificerId);
 		Integer mfgls = artificerInfo.getTripWayNum();//免费公里数
+		if(mfgls == null){
+			mfgls = 0;
+		}
 		BigDecimal freeKilometers = new BigDecimal(mfgls);
 		String longitude = artificerInfo.getLongitude();
 		String latitude = artificerInfo.getLatitude();
@@ -276,7 +279,9 @@ public class TravelConfServiceImpl extends ServiceImpl<TravelConfDao, TravelConf
 //				fixedPrice = NumberUtil.mul(fixedPrice, 2);
 //			}
 			//最终价格
-			vo.setTravelPrice(NumberUtil.decimalFormat("0.00", fixedPrice));
+//			vo.setTravelPrice(NumberUtil.decimalFormat("0", fixedPrice));
+			fixedPrice = fixedPrice.setScale(0,BigDecimal.ROUND_UP);
+			vo.setTravelPrice(fixedPrice.toString());
 		}else if(TravelEnum.PricingType.TRENDS.getValue().equals(pricingType)){
 			//动态的
 			BigDecimal nightTravelExpenses = new BigDecimal("0");//白天
@@ -295,7 +300,9 @@ public class TravelConfServiceImpl extends ServiceImpl<TravelConfDao, TravelConf
 			//最终价格
 			//计算公式为【起步价 + 夜间出行费 + ((公里数 -起步公里数 - 免费公里数) * 每公里价格)= 最终价格】
 			BigDecimal travelPrice = NumberUtil.add(startingPrice, nightTravelExpenses, NumberUtil.mul(NumberUtil.sub(NumberUtil.sub(kilometerNum,startKilometers), freeKilometers), pricePerKilometer));
-			vo.setTravelPrice(NumberUtil.decimalFormat("0.00", travelPrice));
+//			vo.setTravelPrice(NumberUtil.decimalFormat("0.00", travelPrice));
+			travelPrice = travelPrice.setScale(0,BigDecimal.ROUND_UP);
+			vo.setTravelPrice(travelPrice.toString());
 		}
 		return vo;