From 0b39a6b4f6962d9454a61d34bba2098ffa3993a9 Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期日, 20 四月 2025 01:51:14 +0800
Subject: [PATCH] Merge branch '1.1' of http://120.76.84.145:10101/gitblit/r/java/XianNingChuXing
---
DriverOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/taxi/service/impl/OrderTaxiServiceImpl.java | 7 +++++--
1 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/DriverOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/taxi/service/impl/OrderTaxiServiceImpl.java b/DriverOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/taxi/service/impl/OrderTaxiServiceImpl.java
index 2731db8..3240c07 100644
--- a/DriverOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/taxi/service/impl/OrderTaxiServiceImpl.java
+++ b/DriverOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/taxi/service/impl/OrderTaxiServiceImpl.java
@@ -493,8 +493,8 @@
company = companyService.selectById(driver.getCompanyId());
}
TransactionDetails transactionDetails = new TransactionDetails();
- driver.setBalance(driver.getBalance() - company.getFixedDeduction());
- transactionDetails.setMoney(company.getFixedDeduction());
+ driver.setBalance(driver.getBalance() - company.getMeterPrintingFee());
+ transactionDetails.setMoney(company.getMeterPrintingFee());
// 新增扣除使用费记录
transactionDetails.setUserId(driver.getId());
transactionDetails.setInsertTime(new Date());
@@ -777,6 +777,9 @@
System.err.println("订单数据异常：" + orderId);
return false;
}
+ if(orderTaxi.getState() != 5){
+ return false;
+ }
OrderPosition orderPosition = orderPositionService.queryNew(orderId, 2);
String now = lon + "," + lat;
String old = null;
--
Gitblit v1.7.1