From 6c0d8fb2db64b8982c4162c7527e72841547110b Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期五, 27 十二月 2024 15:28:50 +0800
Subject: [PATCH] 修改推单规则
---
DriverAHTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/ReassignServiceImpl.java | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/DriverAHTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/ReassignServiceImpl.java b/DriverAHTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/ReassignServiceImpl.java
index c84518f..5f0b873 100644
--- a/DriverAHTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/ReassignServiceImpl.java
+++ b/DriverAHTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/ReassignServiceImpl.java
@@ -148,12 +148,11 @@
if(reassign.getPayType() == 3){//余额
reassign.setState(2);
reassign.setPayTime(new Date());
- reassignMapper.updateById(reassign);
Double balance = driver.getBalance();
Double laveBusinessMoney = driver.getLaveBusinessMoney();
Double laveActivityMoney = driver.getLaveActivityMoney();
- if(balance < -100){
+ if(null == balance || -100 >= balance || -100 >= (balance - aDouble)){
throw new SystemException("账户余额不足");
}
if(null != laveBusinessMoney && laveBusinessMoney.compareTo(aDouble) >= 0){
@@ -165,7 +164,8 @@
driverService.updateById(driver);
//添加交易明细
transactionDetailsService.saveData(uid, "司机改派支付", aDouble, 2, 1, 2, reassign.getOrderType(), reassign.getOrderId());
-
+
+ reassignMapper.updateById(reassign);
//修改改派通知状态
switch (reassign.getOrderType()){
@@ -320,7 +320,7 @@
Double balance = driver.getBalance();
Double laveBusinessMoney = driver.getLaveBusinessMoney();
Double laveActivityMoney = driver.getLaveActivityMoney();
- if(null == balance || balance < totalMoney){
+ if(null == balance || -100 >= balance || -100 >= (balance - totalMoney)){
throw new SystemException("账户余额不足");
}
if(null != laveBusinessMoney && laveBusinessMoney.compareTo(totalMoney) >= 0){
--
Gitblit v1.7.1