From 24e0fb0dcff3c0a0ea176ea3a40d3c661a2d132a Mon Sep 17 00:00:00 2001
From: yangjun <1173114630@qq.com>
Date: Sun, 23 Jun 2024 16:59:00 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=8E=B7=E5=8F=96=E6=8A=80?=
 =?UTF-8?q?=E5=B8=88=E5=87=BA=E8=A1=8C=E6=96=B9=E5=BC=8F=E5=8F=8A=E5=85=8D?=
 =?UTF-8?q?=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         | 13 +++++++++++--
 1 file changed, 11 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 dfababd..30003cc 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
@@ -190,8 +190,17 @@ public class TravelConfServiceImpl extends ServiceImpl<TravelConfDao, TravelConf
 	public TravelPriceVo calcTravelPrice(Long artificerId, String toLongitude, String toLatitude) {
 		Artificer artificerInfo = artificerService.getById(artificerId);
 
-		Integer travelType = TravelEnum.TravelType.TAXI.getValue();//先默认出租车 TODO 现在没有字段后补
-		BigDecimal freeKilometers = new BigDecimal(0);//TODO 现在没有字段后补
+		Integer cxfs = artificerInfo.getTripWay();//1公交 2免费 3出租
+		Integer mfgls = artificerInfo.getTripWayNum();//免费公里数
+		if(cxfs==null){
+			cxfs = 3;
+		}
+		if(mfgls==null){
+			mfgls = 0;
+		}
+		Integer travelType = cxfs;//先默认免费
+
+		BigDecimal freeKilometers = new BigDecimal(mfgls);//
 		String longitude = artificerInfo.getLongitude();
 		String latitude = artificerInfo.getLatitude();
 		return calcTravelPrice(travelType, freeKilometers, longitude, latitude, toLongitude, toLatitude);