From 78760e8b4e72d242cf34e387ae14dd8d2088aa2d Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期一, 20 一月 2025 18:10:25 +0800
Subject: [PATCH] 线下支付

---
 DriverNTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/specialTrain/server/impl/OrderPrivateCarServiceImpl.java |    7 ++++++-
 1 files changed, 6 insertions(+), 1 deletions(-)

diff --git a/DriverNTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/specialTrain/server/impl/OrderPrivateCarServiceImpl.java b/DriverNTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/specialTrain/server/impl/OrderPrivateCarServiceImpl.java
index c7f3fd9..2a21b94 100644
--- a/DriverNTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/specialTrain/server/impl/OrderPrivateCarServiceImpl.java
+++ b/DriverNTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/specialTrain/server/impl/OrderPrivateCarServiceImpl.java
@@ -308,6 +308,7 @@
                 orderPrivateCar.setGetoffTime(new Date());
                 orderPrivateCar.setEndServiceTime(new Date());
 
+
 //                //设置结束的时候的经纬度
 //                if (orderPrivateCar.getEndLat()!=null){
 //                        orderPrivateCar.setEndLon(lon);
@@ -360,12 +361,16 @@
     @Override
     public ResultUtil confirmFees(Integer orderId, Integer type, Double parkingFee, Double crossingFee) throws Exception {
         OrderPrivateCar orderPrivateCar = this.selectById(orderId);
+        if(type == 3){
+            orderPrivateCar.setState(8);
+        }else {
+            orderPrivateCar.setState(7);
+        }
         orderPrivateCar = this.setMoney(orderPrivateCar, 0D, 0D);//计算费用
         orderPrivateCar.setPayManner(type);
         orderPrivateCar.setParkMoney(null == parkingFee ? 0D : parkingFee);
         orderPrivateCar.setRoadTollMoney(null == crossingFee ? 0D : crossingFee);
         orderPrivateCar.setOrderMoney(orderPrivateCar.getOrderMoney() + orderPrivateCar.getParkMoney() + orderPrivateCar.getRoadTollMoney());
-        orderPrivateCar.setState(7);
         this.updateById(orderPrivateCar);
 
         pushUtil.removeTask(orderId, 1);//删除定时任务,结束推送数据

--
Gitblit v1.7.1