From 2e97a0b58cc60cb076843b3a860732f71762cff7 Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期四, 16 一月 2025 19:08:15 +0800
Subject: [PATCH] 修改
---
DriverOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/taxi/service/impl/OrderTaxiServiceImpl.java | 87 +++++++++++++++++++++++++++++--------------
1 files changed, 59 insertions(+), 28 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 9ab6a9c..fd3556f 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
@@ -46,7 +46,8 @@
@Autowired
private GDMapElectricFenceUtil gdMapElectricFenceUtil;
-
+ @Autowired
+ private ITransactionDetailsService transactionDetailsService;
@Autowired
private GDFalconUtil gdFalconUtil;
@@ -208,7 +209,22 @@
Company company = companyService.selectById(driver.getCompanyId());
orderTaxi.setState(9);
driver.setState(2);
- driver.setBalance(driver.getBalance() - company.getFixedDeduction());
+// driver.setBalance(driver.getBalance() - company.getFixedDeduction());
+
+ if(Objects.isNull(company)){
+ company = companyService.selectById(driver.getCompanyId());
+ }
+ // 平台收入
+ double money;
+ if(orderTaxi.getOrderSource() == 2 || orderTaxi.getOrderSource() == 3){
+ double v = company.getPercentageDeduction() / 100;
+ money = v * orderTaxi.getOrderMoney();
+ }else {
+ money = company.getFixedDeduction();
+ }
+ driver.setBalance(driver.getBalance() - money);
+ // 新增扣除使用费记录
+ transactionDetailsService.saveData(driver.getId(), "软件使用费", money, 2, 1, 2, 6, orderTaxi.getId(),company.getId());
driverService.updateById(driver);
Car car = carService.selectById(driver.getCarId());
@@ -438,33 +454,37 @@
orderTaxi.setGetoffLat(lat);
orderTaxi.setGetoffAddress(address);
orderTaxi.setGetoffTime(new Date());
- orderTaxi.setState(6);
+ if(orderTaxi.getPayManner()==3){
+ orderTaxi.setState(9);
+ }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);
+// 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;
@@ -500,9 +520,11 @@
if(type == 2){//其他支付，不需要操作，直接完成订单
orderTaxi = this.setMoney1(orderTaxi, travelFee, parkingFee, crossingFee);
orderTaxi.setState(7);
- }else{
+ }else if (type == 1){
orderTaxi = this.setMoney2(orderTaxi, parkingFee, crossingFee);
orderTaxi.setState(7);
+ }else {
+ orderTaxi.setState(8);
}
this.updateById(orderTaxi);
@@ -776,10 +798,18 @@
if(orderTaxi.getState() == 5 || orderTaxi.getState() == 6){//服务中的时候获取实时费用数据
if(orderTaxi.getPayManner() == 2){//其他支付，不需要操作，直接完成订单
orderTaxi = this.setMoney1(orderTaxi, 0D, 0D, 0D);
- }else{
+ }else if(orderTaxi.getPayManner() == 1){
orderTaxi = this.setMoney2(orderTaxi, 0D, 0D);
+ }else {
+ // 无
}
}
+
+ // 查询平台服务费
+ TransactionDetails transactionDetails = transactionDetailsService.selectOne(new EntityWrapper<TransactionDetails>()
+ .eq("orderId", orderId)
+ .eq("orderType", 6)
+ .last("LIMIT 1"));
Map<String, Object> map = new HashMap<>();
map.put("orderMoney", orderTaxi.getOrderMoney());//订单金额
@@ -799,6 +829,7 @@
map.put("couponMoney", orderTaxi.getCouponMoney());//优惠券抵扣金额
map.put("discountMoney", orderTaxi.getDiscountMoney());//折扣抵扣金额
map.put("discount", orderTaxi.getDiscount());//折扣
+ map.put("platformFee", transactionDetails.getMoney());//折扣
return map;
}
--
Gitblit v1.7.1