From 087cc97e2d1f597b8a314a1fb8e2c96fd493fe79 Mon Sep 17 00:00:00 2001
From: bai <1643359946@qq.com>
Date: Thu, 20 Jun 2024 16:47:56 +0800
Subject: [PATCH] =?UTF-8?q?2024=E5=B9=B46=E6=9C=8820=E6=97=A5=20=E8=AE=A1?=
 =?UTF-8?q?=E7=AE=97=E4=BB=B7=E6=A0=BC=E6=8E=A5=E5=8F=A3=E6=96=B0=E5=A2=9E?=
 =?UTF-8?q?=E8=BF=94=E5=9B=9E=E6=8A=80=E5=B8=88=E5=85=8D=E8=B4=B9=E5=85=AC?=
 =?UTF-8?q?=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        |  1 +
 .../sqx/modules/travelconf/vo/TravelPriceVo.java   | 14 ++++++++++----
 2 files changed, 11 insertions(+), 4 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 6d2542c..dfababd 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
@@ -200,6 +200,7 @@ public class TravelConfServiceImpl extends ServiceImpl<TravelConfDao, TravelConf
 	@Override
 	public TravelPriceVo calcTravelPrice(Integer _travelType, BigDecimal freeKilometers, String longitude, String latitude, String toLongitude, String toLatitude){
 		TravelPriceVo vo = new TravelPriceVo();
+		vo.setFreeKilometers(NumberUtil.decimalFormat("0.00",freeKilometers));
 
 		Date now = DateTime.now();
 		//按条件取配置，
diff --git a/src/main/java/com/sqx/modules/travelconf/vo/TravelPriceVo.java b/src/main/java/com/sqx/modules/travelconf/vo/TravelPriceVo.java
index 0b80115..893aa18 100644
--- a/src/main/java/com/sqx/modules/travelconf/vo/TravelPriceVo.java
+++ b/src/main/java/com/sqx/modules/travelconf/vo/TravelPriceVo.java
@@ -5,6 +5,8 @@ import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import java.math.BigDecimal;
+
 /**
  * @ClassName TravelPriceVo
  * @Description TODO
@@ -18,17 +20,21 @@ public class TravelPriceVo {
 
 	/**出行价格（元）*/
 	@ApiModelProperty("出行价格（元）")
-	String travelPrice;
+	private String travelPrice;
 
 	/**出行距离（米）*/
 	@ApiModelProperty("出行距离（米）")
-	Integer distances;
+	private Integer distances;
 
 	/**出行距离（公里/千米）*/
 	@ApiModelProperty("出行距离（公里）")
-	String kilometerNum;
+	private String kilometerNum;
+
+	/**技师免费公里数*/
+	@ApiModelProperty("技师免费公里数")
+	private String freeKilometers;
 
 	/**出行配置具体参数*/
 	@ApiModelProperty("出行配置具体参数")
-	TravelConf conf;
+	private TravelConf conf;
 }