From 56cc0c20ac143d734b54a945ead3b9f3b6d2a65d Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期一, 07 七月 2025 11:10:38 +0800
Subject: [PATCH] 跨城修改座位

---
 DriverNTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/taxi/service/impl/OrderTaxiServiceImpl.java |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/DriverNTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/taxi/service/impl/OrderTaxiServiceImpl.java b/DriverNTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/taxi/service/impl/OrderTaxiServiceImpl.java
index 5190135..68aa3aa 100644
--- a/DriverNTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/taxi/service/impl/OrderTaxiServiceImpl.java
+++ b/DriverNTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/taxi/service/impl/OrderTaxiServiceImpl.java
@@ -394,6 +394,7 @@
                 orderTaxi.setState(6);
                 orderTaxi.setEndServiceTime(new Date());
 
+
                 pushUtil.removeTask(orderId, 2);//删除定时任务,结束推送数据
                 systemNoticeService.addSystemNotice(1, "司机已结束本次行程,谢谢使用", orderTaxi.getUserId());
                 break;
@@ -426,7 +427,7 @@
     public ResultUtil confirmFees(Integer orderId, Integer type, Double travelFee, Double parkingFee, Double crossingFee) throws Exception {
         OrderTaxi orderTaxi = this.selectById(orderId);
         orderTaxi.setPayManner(type);
-        if(type == 2){//其他支付,不需要操作,直接完成订单
+        if(type == 2 || type == 3){//其他支付,不需要操作,直接完成订单
             orderTaxi.setOrderMoney(0D);
             orderTaxi.setTravelMoney(0D);
             orderTaxi.setParkMoney(0D);

--
Gitblit v1.7.1