From 9a97d594f4a7373022eac34c93f9adb511c6af16 Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期三, 16 四月 2025 11:07:39 +0800
Subject: [PATCH] 新增加功能
---
DriverOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/taxi/service/impl/OrderTaxiServiceImpl.java | 51 +++++++++++++++++++++++++--------------------------
1 files changed, 25 insertions(+), 26 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 fd3556f..426cd9b 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
@@ -456,35 +456,30 @@
orderTaxi.setGetoffTime(new Date());
if(orderTaxi.getPayManner()==3){
orderTaxi.setState(9);
+ Driver driver = driverService.selectById(orderTaxi.getDriverId());
+
+ Company company = companyService.selectById(driver.getFranchiseeId());
+ if(Objects.isNull(company)){
+ company = companyService.selectById(driver.getCompanyId());
+ }
+ TransactionDetails transactionDetails = new TransactionDetails();
+ driver.setBalance(driver.getBalance() - company.getFixedDeduction());
+ transactionDetails.setMoney(company.getFixedDeduction());
+ // 新增扣除使用费记录
+ transactionDetails.setUserId(driver.getId());
+ transactionDetails.setInsertTime(new Date());
+ transactionDetails.setRemark("软件使用费");
+ transactionDetails.setState(2);
+ transactionDetails.setType(1);
+ transactionDetails.setUserType(2);
+ transactionDetails.setOrderType(6);
+ transactionDetails.setOrderId(orderTaxi.getId());
+ transactionDetailsMapper.insert(transactionDetails);
+ driverService.updateById(driver);
}else {
orderTaxi.setState(6);
}
orderTaxi.setEndServiceTime(new Date());
-
-// List<TUseMoney> money = useMoneyMapper.selectList(null);
-// Driver driver = driverService.selectById(orderTaxi.getDriverId());
-// Company company = companyService.selectById(driver.getCompanyId());
-// TransactionDetails transactionDetails = new TransactionDetails();
-// if(orderTaxi.getOrderSource() == 2 || orderTaxi.getOrderSource() == 3){
-// double v = company.getPercentageDeduction() / 100;
-// v = v * orderTaxi.getOrderMoney();
-// driver.setBalance(driver.getBalance() - v);
-// transactionDetails.setMoney(v);
-// }else {
-// driver.setBalance(driver.getBalance() - company.getFixedDeduction());
-// transactionDetails.setMoney(company.getFixedDeduction());
-// }
-// // 新增扣除使用费记录
-// transactionDetails.setUserId(driver.getId());
-// transactionDetails.setInsertTime(new Date());
-// transactionDetails.setRemark("软件使用费");
-// transactionDetails.setState(2);
-// transactionDetails.setType(1);
-// transactionDetails.setUserType(2);
-// transactionDetails.setOrderType(6);
-// transactionDetails.setOrderId(orderTaxi.getId());
-// transactionDetailsMapper.insert(transactionDetails);
-// driverService.updateById(driver);
pushUtil.removeTask(orderId, 2);//删除定时任务，结束推送数据
systemNoticeService.addSystemNotice(1, "司机已结束本次行程，谢谢使用", orderTaxi.getUserId());
break;
@@ -829,7 +824,11 @@
map.put("couponMoney", orderTaxi.getCouponMoney());//优惠券抵扣金额
map.put("discountMoney", orderTaxi.getDiscountMoney());//折扣抵扣金额
map.put("discount", orderTaxi.getDiscount());//折扣
- map.put("platformFee", transactionDetails.getMoney());//折扣
+ if(Objects.isNull(transactionDetails)){
+ map.put("platformFee", 0);//折扣
+ }else {
+ map.put("platformFee", transactionDetails.getMoney());//折扣
+ }
return map;
}
--
Gitblit v1.7.1