From 4fd8e9902b92b2a1f78c9550b274cb4e1e191e08 Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期一, 20 一月 2025 18:55:47 +0800
Subject: [PATCH] 线下支付
---
DriverNTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/taxi/service/impl/OrderTaxiServiceImpl.java | 8 ++------
1 files changed, 2 insertions(+), 6 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 5852d06..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
@@ -363,7 +363,7 @@
* @throws Exception
*/
@Override
- public ResultUtil process(Integer orderId, Integer state, Double lon, Double lat, String address,Integer payManner) throws Exception {
+ public ResultUtil process(Integer orderId, Integer state, Double lon, Double lat, String address) throws Exception {
OrderTaxi orderTaxi = this.selectById(orderId);
switch (state){
case 3://出发前往预约点
@@ -394,10 +394,6 @@
orderTaxi.setState(6);
orderTaxi.setEndServiceTime(new Date());
- orderTaxi.setPayManner(payManner);
- if(payManner==2){
- orderTaxi.setState(8);
- }
pushUtil.removeTask(orderId, 2);//删除定时任务，结束推送数据
systemNoticeService.addSystemNotice(1, "司机已结束本次行程，谢谢使用", orderTaxi.getUserId());
@@ -431,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