From 0ab3b801273b52154d1f9ab88ce7d4e2b1676eee Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期三, 21 六月 2023 17:22:46 +0800
Subject: [PATCH] 修改bug
---
driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/service/impl/AccountChangeDetailServiceImpl.java | 10 ++++------
1 files changed, 4 insertions(+), 6 deletions(-)
diff --git a/driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/service/impl/AccountChangeDetailServiceImpl.java b/driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/service/impl/AccountChangeDetailServiceImpl.java
index e2ec610..55527ce 100644
--- a/driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/service/impl/AccountChangeDetailServiceImpl.java
+++ b/driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/service/impl/AccountChangeDetailServiceImpl.java
@@ -136,15 +136,14 @@
if(backgroundBalance > 0 && backgroundBalance < d){
d -= backgroundBalance;
driver.setBackgroundBalance(0D);
- }
- if(backgroundBalance > 0 && backgroundBalance >= d){
+ }else if(backgroundBalance >= d){
AccountChangeDetail accountChangeDetail = new AccountChangeDetail();
accountChangeDetail.setCode(System.currentTimeMillis() + UUIDUtil.getNumberRandom(3));
accountChangeDetail.setUserType(2);
accountChangeDetail.setUserId(driver.getId());
accountChangeDetail.setType(1);
accountChangeDetail.setChangeType(8);
- accountChangeDetail.setOldData(driver.getBalance() + driver.getBackgroundBalance());
+ accountChangeDetail.setOldData(all);
driver.setBackgroundBalance(driver.getBackgroundBalance() - d);
accountChangeDetail.setNewData(driver.getBalance() + driver.getBackgroundBalance());
accountChangeDetail.setExplain("收取保险费");
@@ -166,20 +165,19 @@
accountChangeDetail.setExplain("收取保险费");
accountChangeDetail.setCreateTime(new Date());
this.insert(accountChangeDetail);
- d = 0;
List<RechargeRecord> rechargeRecords = rechargeRecordService.selectList(new EntityWrapper<RechargeRecord>().eq("type", 2).eq("userId", driver.getId()).eq("payStatus", 2).gt("surplusDividedAmount", 0).orderBy("createTime"));
for (RechargeRecord rechargeRecord : rechargeRecords) {
Double surplusDividedAmount = rechargeRecord.getSurplusDividedAmount();
if(surplusDividedAmount.compareTo(d) >= 0){
- ResultUtil fengzhang = orderService.fengzhang(3, null, "553021440975", rechargeRecord.getId().longValue(), rechargeRecord.getOrderNumber(), d, 1);
+ ResultUtil fengzhang = orderService.fengzhang(3, null, "553021440975", null, rechargeRecord.getId(), rechargeRecord.getOrderNumber(), d, 1);
if(fengzhang.getCode() == 10000){
rechargeRecord.setSurplusDividedAmount(rechargeRecord.getSurplusDividedAmount() - d);
rechargeRecordService.updateById(rechargeRecord);
}
break;
}else{
- ResultUtil fengzhang = orderService.fengzhang(3, null, "553021440975", rechargeRecord.getId().longValue(), rechargeRecord.getOrderNumber(), surplusDividedAmount, 1);
+ ResultUtil fengzhang = orderService.fengzhang(3, null, "553021440975", null, rechargeRecord.getId(), rechargeRecord.getOrderNumber(), surplusDividedAmount, 1);
if(fengzhang.getCode() == 10000){
rechargeRecord.setSurplusDividedAmount(0d);
rechargeRecordService.updateById(rechargeRecord);
--
Gitblit v1.7.1