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/system/service/impl/TOrderTransferServiceImpl.java | 18 +++++++-----------
1 files changed, 7 insertions(+), 11 deletions(-)
diff --git a/DriverNTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/TOrderTransferServiceImpl.java b/DriverNTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/TOrderTransferServiceImpl.java
index 3338036..0a7e4d8 100644
--- a/DriverNTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/TOrderTransferServiceImpl.java
+++ b/DriverNTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/TOrderTransferServiceImpl.java
@@ -216,14 +216,14 @@
if(type == 3){
orderPrivateCar.setState(8);
}else {
- 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);
}
+ 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());
+ this.updateById(orderPrivateCar);
pushUtil.removeTask(orderId, 7);//删除定时任务，结束推送数据
systemNoticeService.addSystemNotice(1, "司机已结束本次行程，谢谢使用", orderPrivateCar.getUserId());
@@ -286,7 +286,7 @@
return map;
}
@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 {
TOrderTransfer orderPrivateCar = this.selectById(orderId);
switch (state){
case 3://出发前往预约点
@@ -316,10 +316,6 @@
orderPrivateCar.setGetoffTime(new Date());
orderPrivateCar.setEndServiceTime(new Date());
- orderPrivateCar.setPayManner(payManner);
- if(payManner == 2){
- orderPrivateCar.setState(8);
- }
// //设置结束的时候的经纬度
// if (orderPrivateCar.getEndLat()!=null){
--
Gitblit v1.7.1