From 4041cb7dafbd2fd394b31d95c5e64528b9f91505 Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期五, 25 七月 2025 14:55:52 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
DriverQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/ReassignServiceImpl.java | 32 ++++++++++++++++----------------
1 files changed, 16 insertions(+), 16 deletions(-)
diff --git a/DriverQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/ReassignServiceImpl.java b/DriverQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/ReassignServiceImpl.java
index ee18e5c..18723ab 100644
--- a/DriverQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/ReassignServiceImpl.java
+++ b/DriverQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/ReassignServiceImpl.java
@@ -164,21 +164,21 @@
reassign.setPayTime(new Date());
reassignMapper.updateById(reassign);
- Double balance = driver.getBalance();
- Double laveBusinessMoney = driver.getLaveBusinessMoney();
- Double laveActivityMoney = driver.getLaveActivityMoney();
- if(null == balance || balance < aDouble){
- throw new SystemException("账户余额不足");
- }
- if(null != laveBusinessMoney && laveBusinessMoney.compareTo(aDouble) >= 0){
- driver.setLaveBusinessMoney(new BigDecimal(laveBusinessMoney).subtract(new BigDecimal(aDouble)).setScale(2, BigDecimal.ROUND_HALF_EVEN).doubleValue());
- }else if(null != laveActivityMoney && laveActivityMoney.compareTo(aDouble) >= 0){
- driver.setLaveActivityMoney(new BigDecimal(laveActivityMoney).subtract(new BigDecimal(aDouble)).setScale(2, BigDecimal.ROUND_HALF_EVEN).doubleValue());
- }
- driver.setBalance(new BigDecimal(balance).subtract(new BigDecimal(aDouble)).setScale(2, BigDecimal.ROUND_HALF_EVEN).doubleValue());
- driverService.updateById(driver);
+// Double balance = driver.getBalance();
+// Double laveBusinessMoney = driver.getLaveBusinessMoney();
+// Double laveActivityMoney = driver.getLaveActivityMoney();
+// if(null == balance || balance < aDouble){
+// throw new SystemException("账户余额不足");
+// }
+// if(null != laveBusinessMoney && laveBusinessMoney.compareTo(aDouble) >= 0){
+// driver.setLaveBusinessMoney(new BigDecimal(laveBusinessMoney).subtract(new BigDecimal(aDouble)).setScale(2, BigDecimal.ROUND_HALF_EVEN).doubleValue());
+// }else if(null != laveActivityMoney && laveActivityMoney.compareTo(aDouble) >= 0){
+// driver.setLaveActivityMoney(new BigDecimal(laveActivityMoney).subtract(new BigDecimal(aDouble)).setScale(2, BigDecimal.ROUND_HALF_EVEN).doubleValue());
+// }
+// driver.setBalance(new BigDecimal(balance).subtract(new BigDecimal(aDouble)).setScale(2, BigDecimal.ROUND_HALF_EVEN).doubleValue());
+// driverService.updateById(driver);
//添加交易明细
- transactionDetailsService.saveData(uid, "司机改派支付", aDouble, 2, 1, 2, reassign.getOrderType(), reassign.getOrderId());
+// transactionDetailsService.saveData(uid, "司机改派支付", aDouble, 2, 1, 2, reassign.getOrderType(), reassign.getOrderId());
//修改改派通知状态
@@ -191,7 +191,7 @@
orderPrivateCarService.updateById(orderPrivateCar);
//添加已收入明细
- incomeService.saveData(1, orderPrivateCar.getCompanyId(), 4, orderPrivateCar.getId(), 1, reassign.getMoney());
+// incomeService.saveData(1, orderPrivateCar.getCompanyId(), 4, orderPrivateCar.getId(), 1, reassign.getMoney());
// qyt 改派直接推送
pushOrderPrivate(orderPrivateCar,uid);
break;
@@ -203,7 +203,7 @@
orderTaxiService.updateById(orderTaxi);
//添加已收入明细
- incomeService.saveData(1, orderTaxi.getCompanyId(), 4, orderTaxi.getId(), 2, reassign.getMoney());
+// incomeService.saveData(1, orderTaxi.getCompanyId(), 4, orderTaxi.getId(), 2, reassign.getMoney());
// qyt 改派直接推送
pushOrderTaxi(orderTaxi,uid);
--
Gitblit v1.7.1