From 5cb1979f05446792cc33a8cb6b7aaae906da5a70 Mon Sep 17 00:00:00 2001
From: liujie <liujie>
Date: 星期三, 16 八月 2023 09:32:38 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/dao/mapping/RevenueMapper.xml | 27 ++++++++++++++++++++++++++-
1 files changed, 26 insertions(+), 1 deletions(-)
diff --git a/driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/dao/mapping/RevenueMapper.xml b/driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/dao/mapping/RevenueMapper.xml
index 8dec2cb..a694c06 100644
--- a/driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/dao/mapping/RevenueMapper.xml
+++ b/driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/dao/mapping/RevenueMapper.xml
@@ -16,7 +16,7 @@
<select id="queryTotalAmount" resultType="double">
- select sum(amount) as amount from t_revenue where userType = 2 and userId = #{driverId}
+ select sum(amount) as amount from t_revenue where userType = 2 and userId = #{driverId} and type in (1,2)
</select>
@@ -57,4 +57,29 @@
group by a.userId,b.`name`
) as aa,( SELECT @ROW := 0 ) AS itable order by aa.number desc
</select>
+
+
+ <select id="queryAgentBalance" resultType="double">
+ select
+ sum(aa.income) - sum(aa.disburse) as balance
+ from (
+ select sum(amount) as income, 0 as disburse from t_revenue where userType = 3 and userId = #{companyId}
+ union all
+ select 0 as ncome, sum(amount) as disburse from t_settlement_record where type = 2 and objectId = #{companyId}
+ ) as aa
+ </select>
+
+
+
+ <select id="queryCompanyBalance" resultType="double">
+ select
+ sum(aa.income) - sum(aa.disburse) + sum(aa.recharge) as balance
+ from (
+ select sum(amount) as income, 0 as disburse, 0 as recharge from t_revenue where userType = 4
+ union all
+ select 0 as ncome, sum(amount) as disburse, 0 as recharge from t_settlement_record where type = 1
+ union all
+ select 0 as ncome, 0 as disburse, sum(surplusDividedAmount) as recharge from t_recharge_record where type = 4 and payStatus = 2
+ ) as aa
+ </select>
</mapper>
--
Gitblit v1.7.1