From f4e12a183070e9fc1db174dfb7f1c9a59f7763a1 Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期四, 17 四月 2025 09:08:23 +0800
Subject: [PATCH] 新增加功能
---
DriverOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/taxi/service/impl/OrderTaxiServiceImpl.java | 99 ++++++++++++++++++++++++++++++++++---------------
1 files changed, 68 insertions(+), 31 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..2731db8 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
@@ -454,37 +454,69 @@
orderTaxi.setGetoffLat(lat);
orderTaxi.setGetoffAddress(address);
orderTaxi.setGetoffTime(new Date());
+ orderTaxi.setEndServiceTime(new Date());
if(orderTaxi.getPayManner()==3){
orderTaxi.setState(9);
- }else {
- orderTaxi.setState(6);
- }
- orderTaxi.setEndServiceTime(new Date());
+ Driver driver = driverService.selectById(orderTaxi.getDriverId());
-// 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);
+ 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);
+ }
+ //打表计费，直接订单完成支付，
+ if(orderTaxi.getPayManner()==2){
+ orderTaxi = this.setMoney2(orderTaxi, 0D, 0D);
+ //在线上计费的基础上随机加0.01-1的金额
+ Double orderMoney = orderTaxi.getOrderMoney() + (new BigDecimal(Math.random()).setScale(2, BigDecimal.ROUND_DOWN).doubleValue());
+ orderTaxi.setState(8);
+ orderTaxi.setOrderMoney(orderMoney);
+ orderTaxi.setPayMoney(orderMoney);
+ 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);
+ }
+ //线上计费，计算费用后修改为待支付
+ if(orderTaxi.getPayManner()==1){
+ orderTaxi = this.setMoney2(orderTaxi, 0D, 0D);
+ orderTaxi.setState(7);
+ }
+ //回滚司机状态为空闲
+ Driver driver = driverService.selectById(orderTaxi.getDriverId());
+ driver.setState(2);
+ driverService.updateById(driver);
+
pushUtil.removeTask(orderId, 2);//删除定时任务，结束推送数据
systemNoticeService.addSystemNotice(1, "司机已结束本次行程，谢谢使用", orderTaxi.getUserId());
break;
@@ -492,11 +524,12 @@
this.updateById(orderTaxi);
// TODO: 2020/6/5 推送状态
+ OrderTaxi finalOrderTaxi = orderTaxi;
new Thread(new Runnable() {
@Override
public void run() {
- pushUtil.pushOrderState(1, orderTaxi.getUserId(), orderTaxi.getId(), 2, orderTaxi.getState());
- pushUtil.pushOrderState(2, orderTaxi.getDriverId(), orderTaxi.getId(), 2, orderTaxi.getState());
+ pushUtil.pushOrderState(1, finalOrderTaxi.getUserId(), finalOrderTaxi.getId(), 2, finalOrderTaxi.getState());
+ pushUtil.pushOrderState(2, finalOrderTaxi.getDriverId(), finalOrderTaxi.getId(), 2, finalOrderTaxi.getState());
}
}).start();
return ResultUtil.success();
@@ -829,7 +862,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