BUG修改

xuhy

2023-05-16 f4d52e83eb99233c895a0fff0eef287792130752

 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;
@@ -96,8 +99,8 @@
        // 开始，结束时间
        if(StringUtils.hasLength(createTime)){
            String[] split = createTime.split(" - ");
            Date startTime = DateUtil.getDate_str4(split[0]);
            Date endTime = DateUtil.getDate_str4(split[1]);
            Date startTime = DateUtil.getDate_str3(split[0]+" 00:00:00");
            Date endTime = DateUtil.getDate_str3(split[1]+" 23:59:59");
            wrapper.between("createTime",startTime,endTime);
        }
        wrapper.orderBy(true,"approvalStatus");
@@ -185,11 +188,8 @@

        // 计算驾龄
        if(Objects.nonNull(tDriver.getFirstCertificateTime())){
            ZoneId zoneId = ZoneId.systemDefault();
            LocalDate firstTime = tDriver.getFirstCertificateTime().toInstant().atZone(zoneId).toLocalDate();
            LocalDate now = tDriver.getFirstCertificateTime().toInstant().atZone(zoneId).toLocalDate();
            Period period = Period.between(firstTime, now);
            model.addAttribute("drivingExperience",period.getYears());
            Period period = Period.between(LocalDate.now(), com.stylefeng.guns.modular.system.util.DateUtil.dateToLocalDate(tDriver.getFirstCertificateTime()));
            model.addAttribute("drivingExperience",Math.max(Math.abs(period.getYears()), 1));
        }else {
            model.addAttribute("drivingExperience",0);
        }
@@ -231,10 +231,10 @@
                TDriver tDriver1 = tDriverMapper.selectById(tDriver.getInviterId());
                model.addAttribute("inviterName",tDriver1.getName());
                model.addAttribute("inviterPhone",tDriver1.getPhone());
            }else {
                model.addAttribute("inviterName","");
                model.addAttribute("inviterPhone","");
            }
        }else {
            model.addAttribute("inviterName","");
            model.addAttribute("inviterPhone","");
        }

        // 查询当前用户邀请了哪些人
@@ -288,7 +288,11 @@
                    .eq("userId", tDriver.getId()));
            Optional<BigDecimal> reduce = tRevenues.stream().map(TRevenue::getAmount).reduce(BigDecimal::add);
            // 减去充值金额
            reduce.ifPresent(bigDecimal -> model.addAttribute("cumulativeIncome", bigDecimal));
            if(reduce.isPresent()){
                model.addAttribute("cumulativeIncome", reduce.get());
            }else {
                model.addAttribute("cumulativeIncome",0);
            }
        }else {
            model.addAttribute("cumulativeOrderCount",0);
            model.addAttribute("monthOrderCount",0);
@@ -505,11 +509,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);
@@ -522,8 +526,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));