From aa241a47c90ed776062adf0b8daccf288a21836f Mon Sep 17 00:00:00 2001
From: liujie <liujie>
Date: 星期四, 10 八月 2023 09:55:54 +0800
Subject: [PATCH] 合并代码
---
driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/service/impl/RevenueServiceImpl.java | 37 +++++++++++++++++++++++--------------
1 files changed, 23 insertions(+), 14 deletions(-)
diff --git a/driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/service/impl/RevenueServiceImpl.java b/driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/service/impl/RevenueServiceImpl.java
index 591cfc2..4cba21d 100644
--- a/driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/service/impl/RevenueServiceImpl.java
+++ b/driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/service/impl/RevenueServiceImpl.java
@@ -55,7 +55,7 @@
@Override
public List<CommissionListWarpper> queryCommissionList(Integer driverId, String time, Integer pageNum, Integer pageSize) throws Exception {
pageNum = (pageNum - 1) * pageSize;
- Wrapper<Revenue> wrapper = new EntityWrapper<Revenue>().eq("type", 2).eq("userType", 2)
+ Wrapper<Revenue> wrapper = new EntityWrapper<Revenue>().eq("userType", 2)
.eq("userId", driverId);
if(ToolUtil.isNotEmpty(time)){
wrapper.eq("DATE_FORMAT(createTime, '%Y年%m月')", time);
@@ -66,19 +66,7 @@
CommissionListWarpper commissionListWarpper = new CommissionListWarpper();
commissionListWarpper.setCreateTime(revenue.getCreateTime().getTime());
commissionListWarpper.setAmount(revenue.getAmount());
- Order order = orderService.selectById(revenue.getOrderId());
- if(null != order.getUserId()){
- AppUser appUser = appUserService.selectById(order.getUserId());
- if(null != appUser.getInviterType() && appUser.getInviterType() == 2 && appUser.getInviterId().compareTo(driverId) == 0){
- commissionListWarpper.setUserType(1);
- }
- }
- if(null == commissionListWarpper.getUserType()){
- Driver driver = driverService.selectById(order.getDriverId());
- if(null != driver.getInviterType() && driver.getInviterType() == 2 && driver.getInviterId().compareTo(driverId) == 0){
- commissionListWarpper.setUserType(2);
- }
- }
+ commissionListWarpper.setUserType(revenue.getType());
list.add(commissionListWarpper);
}
return list;
@@ -106,4 +94,25 @@
public List<PerformanceRankingWarpper> queryDriverRank(Integer type, String time, Integer dayType) {
return this.baseMapper.queryDriverRank(type, time, dayType);
}
+
+
+ /**
+ * 获取代理商账户余额
+ * @param companyId
+ * @return
+ */
+ @Override
+ public Double queryAgentBalance(Integer companyId) {
+ return this.baseMapper.queryAgentBalance(companyId);
+ }
+
+
+ /**
+ * 获取平台账户余额
+ * @return
+ */
+ @Override
+ public Double queryCompanyBalance() {
+ return this.baseMapper.queryCompanyBalance();
+ }
}
--
Gitblit v1.7.1