From eddb5feca520566eddb5cda01fb4a9a0cdcec078 Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期一, 20 一月 2025 15:34:16 +0800
Subject: [PATCH] 线下支付
---
DriverNTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/taxi/service/impl/OrderTaxiServiceImpl.java | 9 +++++++--
1 files changed, 7 insertions(+), 2 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..90f1870 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) throws Exception {
+ public ResultUtil process(Integer orderId, Integer state, Double lon, Double lat, String address,Integer payManner) throws Exception {
OrderTaxi orderTaxi = this.selectById(orderId);
switch (state){
case 3://出发前往预约点
@@ -393,6 +393,11 @@
orderTaxi.setGetoffTime(new Date());
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());
@@ -426,7 +431,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