From c2298b7feb6c8d968cac3da3e9d3caa56853f648 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期五, 26 五月 2023 15:14:34 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/TDriverServiceImpl.java | 68 +++++++++++++++++++++++++++-------
1 files changed, 54 insertions(+), 14 deletions(-)
diff --git a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/TDriverServiceImpl.java b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/TDriverServiceImpl.java
index 5deea73..d6eac87 100644
--- a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/TDriverServiceImpl.java
+++ b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/TDriverServiceImpl.java
@@ -24,6 +24,7 @@
import org.slf4j.LoggerFactory;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.format.annotation.DateTimeFormat;
import org.springframework.stereotype.Service;
import org.springframework.ui.Model;
import org.springframework.util.CollectionUtils;
@@ -37,8 +38,10 @@
import java.net.URLConnection;
import java.text.SimpleDateFormat;
import java.time.LocalDate;
+import java.time.LocalDateTime;
import java.time.Period;
import java.time.ZoneId;
+import java.time.format.DateTimeFormatter;
import java.util.*;
import java.util.concurrent.atomic.AtomicInteger;
import java.util.stream.Collectors;
@@ -181,6 +184,7 @@
model.addAttribute("areaName",tDriver.getAreaName());
model.addAttribute("integral",tDriver.getIntegral());
model.addAttribute("score",tDriver.getScore());
+ model.addAttribute("source",tDriver.getSource());
model.addAttribute("createTime",new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(tDriver.getCreateTime()));
// 计算驾龄
@@ -237,8 +241,16 @@
// 查询当前用户邀请了哪些人
List<TDriver> list = tDriverMapper.selectList(new EntityWrapper<TDriver>().eq("inviterId", tDriver.getId()));
if(!CollectionUtils.isEmpty(list)){
+ List<TCashWithdrawal> tCashWithdrawals = tCashWithdrawalMapper.selectList(new EntityWrapper<TCashWithdrawal>()
+ .eq("type", UserTypeEnum.DRIVER.getCode())
+ .eq("userDriverId", tDriver.getId())
+ .eq("businessType", 11)
+ .eq("state", 2));
+ Optional<BigDecimal> reduce = tCashWithdrawals.stream().map(TCashWithdrawal::getAmount).reduce(BigDecimal::add);
+ BigDecimal bigDecimal = BigDecimal.ZERO;
+ reduce.ifPresent(bigDecimal::add);
+ model.addAttribute("inviterCommission",bigDecimal.add(tDriver.getCommission()));
model.addAttribute("inviterCount",list.size());
- model.addAttribute("inviterCommission",0);
}else {
model.addAttribute("inviterCommission",0);
model.addAttribute("inviterCount",0);
@@ -435,11 +447,23 @@
commissionResp.setConnectedPersons(connectedPersons.get());
// 已提现佣金 查询该司机的佣金提现记录
- commissionResp.setWithdrawnAmount(BigDecimal.ZERO);
-
+ List<TCashWithdrawal> tCashWithdrawals = tCashWithdrawalMapper.selectList(new EntityWrapper<TCashWithdrawal>()
+ .eq("type", UserTypeEnum.DRIVER.getCode())
+ .eq("userDriverId", driver.getId())
+ .eq("businessType", 11)
+ .eq("state", 2));
+ BigDecimal bigDecimal = BigDecimal.ZERO;
+ if(!CollectionUtils.isEmpty(tCashWithdrawals)){
+ Optional<BigDecimal> reduce = tCashWithdrawals.stream().map(TCashWithdrawal::getAmount).reduce(BigDecimal::add);
+ if(reduce.isPresent()){
+ bigDecimal.add(reduce.get());
+ commissionResp.setWithdrawnAmount(bigDecimal);
+ }
+ }else {
+ commissionResp.setWithdrawnAmount(bigDecimal);
+ }
// 累计佣金 可提现佣金+已提现佣金
- commissionResp.setAccumulatedCommission(BigDecimal.ZERO);
-
+ commissionResp.setAccumulatedCommission(bigDecimal.add(commissionResp.getCommission()));
commissionRespList.add(commissionResp);
}
@@ -447,11 +471,12 @@
}
@Override
- public void driverCommissionDetail(Integer tDriverId, Model model) {
+ public void driverCommissionDetail(Integer tDriverId, Integer levelFlag,Model model) {
// 查询司机
TDriver driver = tDriverMapper.selectById(tDriverId);
+ model.addAttribute("levelFlag",levelFlag);
// 司机信息封装
model.addAttribute("driverId",tDriverId);
model.addAttribute("name",driver.getName());
@@ -491,11 +516,26 @@
model.addAttribute("numberPromoters",0);
}
model.addAttribute("connectedPersons",connectedPersons.get());
- // 已提现佣金 查询该司机的佣金提现记录
- model.addAttribute("withdrawnAmount",BigDecimal.ZERO);
+ List<TCashWithdrawal> tCashWithdrawals = tCashWithdrawalMapper.selectList(new EntityWrapper<TCashWithdrawal>()
+ .eq("type", UserTypeEnum.DRIVER.getCode())
+ .eq("userDriverId", driver.getId())
+ .eq("businessType", 11)
+ .eq("state", 2));
+ BigDecimal bigDecimal = BigDecimal.ZERO;
+ if(!CollectionUtils.isEmpty(tCashWithdrawals)){
+ Optional<BigDecimal> reduce = tCashWithdrawals.stream().map(TCashWithdrawal::getAmount).reduce(BigDecimal::add);
+ if(reduce.isPresent()){
+ bigDecimal.add(reduce.get());
+ // 已提现佣金 查询该司机的佣金提现记录
+ model.addAttribute("withdrawnAmount",bigDecimal);
+ }
+ }else {
+ // 已提现佣金 查询该司机的佣金提现记录
+ model.addAttribute("withdrawnAmount",bigDecimal);
+ }
// commissionResp.setWithdrawnAmount(BigDecimal.ZERO);
// 累计佣金 可提现佣金+已提现佣金
- model.addAttribute("accumulatedCommission",BigDecimal.ZERO);
+ model.addAttribute("accumulatedCommission",bigDecimal.add(driver.getCommission()));
// commissionResp.setAccumulatedCommission(BigDecimal.ZERO);
}
@@ -506,11 +546,11 @@
Integer driverTotal = tDriverMapper.selectCount(new EntityWrapper<TDriver>()
.eq("agentId", agentId));
// 司机最近一月数量
- LocalDate now = LocalDate.now();
- LocalDate localDate = now.plusMonths(1);
+ LocalDateTime now = LocalDateTime.now();
+ LocalDateTime localDateTime = now.minusMonths(1);
Integer driverMonthTotal = tDriverMapper.selectCount(new EntityWrapper<TDriver>()
.eq("agentId", agentId)
- .between("createTime", localDate, now));
+ .between("createTime", localDateTime, now));
model.addAttribute("driverTotal",driverTotal);
model.addAttribute("driverMonthTotal",driverMonthTotal);
map.put("driverTotal",driverTotal);
@@ -523,8 +563,8 @@
Integer driverTotal = tDriverMapper.selectCount(new EntityWrapper<TDriver>()
.in("agentId", ids));
// 司机最近一月数量
- LocalDate now = LocalDate.now();
- LocalDate localDate = now.plusMonths(1);
+ LocalDateTime now = LocalDateTime.now();
+ LocalDateTime localDate = now.minusMonths(1);
Integer driverMonthTotal = tDriverMapper.selectCount(new EntityWrapper<TDriver>()
.in("agentId", ids)
.between("createTime", localDate, now));
--
Gitblit v1.7.1