From d5b3e5a413bcfccba294793ee093722f31b2448a Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期三, 16 八月 2023 17:02:13 +0800
Subject: [PATCH] 添加推单日志
---
driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/service/impl/RevenueServiceImpl.java | 40 ++++++++++++++++++++++++++--------------
1 files changed, 26 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 3911b70..7ebd975 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
@@ -14,6 +14,7 @@
import com.supersavedriving.driver.modular.system.service.IOrderService;
import com.supersavedriving.driver.modular.system.service.IRevenueService;
import com.supersavedriving.driver.modular.system.warpper.CommissionListWarpper;
+import com.supersavedriving.driver.modular.system.warpper.PerformanceRankingWarpper;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@@ -54,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);
@@ -65,21 +66,32 @@
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;
}
+
+ /**
+ * 获取司机总收入
+ * @param driverId
+ * @return
+ * @throws Exception
+ */
+ @Override
+ public Double queryTotalAmount(Integer driverId) throws Exception {
+ return this.baseMapper.queryTotalAmount(driverId);
+ }
+
+
+ /**
+ * 获取司机佣金收入排行
+ * @param time
+ * @param dayType
+ * @return
+ */
+ @Override
+ public List<PerformanceRankingWarpper> queryDriverRank(Integer type, String time, Integer dayType) {
+ return this.baseMapper.queryDriverRank(type, time, dayType);
+ }
}
--
Gitblit v1.7.1