From e2d01b2009c30173ff8e9f77d5c065f4d38fa49d Mon Sep 17 00:00:00 2001
From: 44323 <443237572@qq.com>
Date: 星期五, 17 五月 2024 17:56:07 +0800
Subject: [PATCH] Merge branch '2.0' of http://120.76.84.145:10101/gitblit/r/java/IgoTravel into 2.0
---
DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/OrderServiceImpl.java | 11 +++++++++--
1 files changed, 9 insertions(+), 2 deletions(-)
diff --git a/DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/OrderServiceImpl.java b/DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/OrderServiceImpl.java
index 3cf4d62..d63347f 100644
--- a/DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/OrderServiceImpl.java
+++ b/DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/OrderServiceImpl.java
@@ -100,6 +100,9 @@
@Autowired
private ISettlementRecordService settlementRecordService;
+
+ @Resource
+ private IBalanceUsageRecordService balanceUsageRecordService;
@@ -1207,14 +1210,18 @@
}
if(payType == 3){//余额支付
driver.setBalance(driver.getBalance() - money);
- if(driver.getLaveBusinessMoney().compareTo(money) < 0){
- double b = money - driver.getLaveBusinessMoney();
+ Double laveBusinessMoney = driver.getLaveBusinessMoney();
+ if(laveBusinessMoney.compareTo(money) < 0){
+ double b = money - laveBusinessMoney;
driver.setLaveBusinessMoney(0D);
driver.setLaveActivityMoney(driver.getLaveActivityMoney() - b);
driverService.updateById(driver);
+ balanceUsageRecordService.saveBalanceUsageRecord(driver.getId(), 1, b, orderType == 1 ? 1 : 2);
+ balanceUsageRecordService.saveBalanceUsageRecord(driver.getId(), 2, laveBusinessMoney, orderType == 1 ? 1 : 2);
}else{
driver.setLaveBusinessMoney(driver.getLaveBusinessMoney() - money);
driverService.updateById(driver);
+ balanceUsageRecordService.saveBalanceUsageRecord(driver.getId(), 2, money, orderType == 1 ? 1 : 2);
}
if(orderType == 1){//专车
--
Gitblit v1.7.1