From aefc1418eca2e0bf977b03b0359e0ef53a13e964 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9B=B9=E7=A3=8A?= <45566618@qq.com>
Date: Thu, 18 Jul 2024 13:42:26 +0800
Subject: [PATCH] =?UTF-8?q?=E8=BD=A6=E8=B4=B9=E8=AE=A1=E7=AE=97=E5=87=BA?=
 =?UTF-8?q?=E7=8E=B0=E8=B4=9F=E6=95=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/OrdersServiceImpl.java       |  5 +++-
 .../service/impl/TravelConfServiceImpl.java   | 23 ++++++++++++++-----
 2 files changed, 21 insertions(+), 7 deletions(-)

diff --git a/src/main/java/com/sqx/modules/artificer/service/impl/OrdersServiceImpl.java b/src/main/java/com/sqx/modules/artificer/service/impl/OrdersServiceImpl.java
index 6a78850..f4fc3bc 100644
--- a/src/main/java/com/sqx/modules/artificer/service/impl/OrdersServiceImpl.java
+++ b/src/main/java/com/sqx/modules/artificer/service/impl/OrdersServiceImpl.java
@@ -2037,7 +2037,10 @@ public class OrdersServiceImpl extends ServiceImpl<OrdersDao, Orders> implements
         Orders orders = baseMapper.selectById(ordersId);
         if (orders.getStatus() == 4) {
             return Result.error("订单已经取消了！");
-        } else if (orders.getStatus() == 3 || orders.getStatus() == 5) {
+        }else if (orders.getStatus() == 1) {
+            String remarks = "取消订单将扣除：0元的手续费！";
+            return Result.success().put("data",remarks);
+        }else if (orders.getStatus() == 3 || orders.getStatus() == 5) {
             return Result.error("订单已经完成了，无法取消！");
         }else if (orders.getStatus() == 6) {
             if(orders.getOldOrdersId() != null && orders.getOldOrdersId() != 0){
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 5ec2129..aaae5e5 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
@@ -206,7 +206,7 @@ public class TravelConfServiceImpl extends ServiceImpl<TravelConfDao, TravelConf
 	public TravelPriceVo calcTravelPrice(Long artificerId, String toLongitude, String toLatitude, String serveTime) {
 		Artificer artificerInfo = artificerService.getById(artificerId);
 
-		Integer cxfs = artificerInfo.getTripWay();//1公交 2免费 3出租
+		Integer cxfs = artificerInfo.getTripWay();//1公交 2出租 3免费
 		Integer mfgls = artificerInfo.getTripWayNum();//免费公里数
 		if(cxfs==null){
 			cxfs = 3;
@@ -289,7 +289,6 @@ public class TravelConfServiceImpl extends ServiceImpl<TravelConfDao, TravelConf
 				//夜间
 				nightTravelExpenses = conf.getNightTravelExpenses();
 			}
-
 			//起步公里数
 			BigDecimal startKilometers = conf.getFreeKilometers();
 			//起步价
@@ -298,14 +297,26 @@ public class TravelConfServiceImpl extends ServiceImpl<TravelConfDao, TravelConf
 			BigDecimal pricePerKilometer = conf.getPricePerKilometer();
 
 			//最终价格
-			//计算公式为【起步价 + 夜间出行费 + ((公里数 -起步公里数 - 免费公里数) * 每公里价格)= 最终价格】
-			BigDecimal travelPrice = NumberUtil.add(startingPrice, nightTravelExpenses, NumberUtil.mul(NumberUtil.sub(NumberUtil.sub(kilometerNum,startKilometers), freeKilometers), pricePerKilometer));
-//			vo.setTravelPrice(NumberUtil.decimalFormat("0.00", travelPrice));
+			//计算公式为【起步价 + 夜间出行费 + ((公里数 -起步公里数 - 免费公里数) * 每公里价格)= 最终价格】 作废
+//			BigDecimal travelPrice = NumberUtil.add(startingPrice, nightTravelExpenses, NumberUtil.mul(NumberUtil.sub(NumberUtil.sub(kilometerNum, ), freeKilometers), pricePerKilometer));
+			BigDecimal travelPrice = BigDecimal.ZERO;
+			//公里数<免费公里数：车费=夜间出行费
+			if(kilometerNum.compareTo(freeKilometers)<0){
+				travelPrice = nightTravelExpenses;
+			}else{
+				BigDecimal kilometers = kilometerNum.subtract(freeKilometers);
+				//公里数>免费公里数：公里数-免费公里数<起步公里数时，车费=夜间出行费+起步价
+				if(kilometers.compareTo(startKilometers)<0){
+					travelPrice = nightTravelExpenses.add(startingPrice);
+				}else{
+					//公里数>免费公里数：公里数-免费公里数>起步公里数时，车费=夜间出行费+起步价+(公里数-免费公里数-起步公里数)*每公里价格
+					travelPrice = nightTravelExpenses.add(startingPrice).add(kilometers.subtract(startKilometers).multiply(pricePerKilometer));
+				}
+			}
 			travelPrice = travelPrice.setScale(0,BigDecimal.ROUND_UP);
 			vo.setTravelPrice(travelPrice.toString());
 		}
 		return vo;
-
 	}
 
 }