From f4c8c73bc5181b6d3265c6a0ce19ae13c600baa3 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期四, 04 九月 2025 12:07:18 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
ManagementZYTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/TIncomeController.java | 12 ++++++------
1 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/ManagementZYTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/TIncomeController.java b/ManagementZYTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/TIncomeController.java
index bf91ce1..42ae3b5 100644
--- a/ManagementZYTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/TIncomeController.java
+++ b/ManagementZYTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/TIncomeController.java
@@ -209,7 +209,7 @@
temp.put("amount",income.getMoney());
temp.put("withType","订单号");
// todo 新增收入明细时 需要存储当前账户余额
- temp.put("balance",0);
+ temp.put("balance",income.getDriverBalance());
res.add(temp);
}
}
@@ -245,7 +245,7 @@
temp.put("amount",income.getMoney());
temp.put("withType","订单号");
// todo 新增收入明细时 需要存储当前账户余额
- temp.put("balance",0);
+ temp.put("balance",income.getDriverBalance());
res.add(temp);
}
}
@@ -270,7 +270,7 @@
temp.put("amount",details.getMoney());
temp.put("withType","交易流水号");
// todo 新增收入明细时 需要存储当前账户余额
- temp.put("balance",0);
+ temp.put("balance",details.getDriverBalance());
res.add(temp);
}
}
@@ -295,7 +295,7 @@
temp.put("amount",details.getMoney());
temp.put("withType","交易流水号");
// todo 新增收入明细时 需要存储当前账户余额
- temp.put("balance",0);
+ temp.put("balance",details.getDriverBalance());
res.add(temp);
}
}
@@ -320,7 +320,7 @@
temp.put("amount",details.getMoney());
temp.put("withType","无");
// todo 新增收入明细时 需要存储当前账户余额
- temp.put("balance",0);
+ temp.put("balance",details.getDriverBalance());
res.add(temp);
}
}
@@ -346,7 +346,7 @@
temp.put("amount",details.getMoney());
temp.put("withType","无");
// todo 新增收入明细时 需要存储当前账户余额
- temp.put("balance",0);
+ temp.put("balance",details.getDriverBalance());
res.add(temp);
}
}
--
Gitblit v1.7.1