From 1e0b6b811c554a4d06d4869c75243c153f40ea9e Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期一, 20 一月 2025 17:40:41 +0800
Subject: [PATCH] 线下支付
---
DriverNTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/TOrderTransferServiceImpl.java | 24 ++++++++++++------------
1 files changed, 12 insertions(+), 12 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 655ca92..c53cbf6 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
@@ -213,13 +213,17 @@
@Override
public ResultUtil confirmFees(Integer orderId, Integer type, Double parkingFee, Double crossingFee) throws Exception {
TOrderTransfer orderPrivateCar = this.selectById(orderId);
- 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);
+ 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);
+ }
pushUtil.removeTask(orderId, 7);//删除定时任务，结束推送数据
systemNoticeService.addSystemNotice(1, "司机已结束本次行程，谢谢使用", orderPrivateCar.getUserId());
@@ -282,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://出发前往预约点
@@ -312,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