From 4ff5f35054ab141d915c11ad878d4dcffe7e034a Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期五, 12 五月 2023 18:43:27 +0800
Subject: [PATCH] BUG修改
---
management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/TDriverServiceImpl.java | 123 +++++++++++++++++++++++++++++++++--------
1 files changed, 99 insertions(+), 24 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 bc2b295..7658f40 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
@@ -11,11 +11,17 @@
import com.stylefeng.guns.modular.system.controller.util.UUIDUtil;
import com.stylefeng.guns.modular.system.dao.*;
import com.stylefeng.guns.modular.system.enums.OrderStateEnum;
+import com.stylefeng.guns.modular.system.enums.PayStatusEnum;
import com.stylefeng.guns.modular.system.enums.StatusEnum;
+import com.stylefeng.guns.modular.system.enums.UserTypeEnum;
import com.stylefeng.guns.modular.system.model.*;
import com.stylefeng.guns.modular.system.service.ITDriverService;
import com.baomidou.mybatisplus.service.impl.ServiceImpl;
import com.stylefeng.guns.modular.system.service.ITRegionService;
+import org.apache.commons.io.FileUtils;
+import org.apache.poi.hdf.extractor.TC;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@@ -24,15 +30,16 @@
import org.springframework.util.StringUtils;
import java.io.File;
+import java.io.IOException;
+import java.io.InputStream;
import java.math.BigDecimal;
+import java.net.URL;
+import java.net.URLConnection;
import java.text.SimpleDateFormat;
import java.time.LocalDate;
import java.time.Period;
import java.time.ZoneId;
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.List;
-import java.util.Objects;
+import java.util.*;
import java.util.concurrent.atomic.AtomicInteger;
import java.util.stream.Collectors;
@@ -63,10 +70,18 @@
@Autowired
private TRegionMapper tRegionMapper;
@Autowired
+ private TRevenueMapper tRevenueMapper;
+ @Autowired
private ITRegionService itRegionService;
@Autowired
private HttpUtils httpUtils;
+ @Autowired
+ private TRechargeRecordMapper tRechargeRecordMapper;
+ @Autowired
+ private TCashWithdrawalMapper tCashWithdrawalMapper;
+
+ private Logger log = LoggerFactory.getLogger(this.getClass());
@Override
public EntityWrapper<TDriver> getPageList(String createTime, String phone, Integer status) {
EntityWrapper<TDriver> wrapper = new EntityWrapper<>();
@@ -127,11 +142,11 @@
}
//累计订单量
List<TOrder> cumulativeOrderCount = tOrders.stream().filter(order -> tDriver.getId().equals(order.getDriverId())
- && order.getState().equals(OrderStateEnum.WAIT_EVALUATED.getCode()) && order.getState().equals(OrderStateEnum.FINISH.getCode())).collect(Collectors.toList());
+ && (order.getState().equals(OrderStateEnum.WAIT_EVALUATED.getCode()) || order.getState().equals(OrderStateEnum.FINISH.getCode()))).collect(Collectors.toList());
tDriverResp.setCumulativeOrderCount(cumulativeOrderCount.size());
//当月订单量
List<TOrder> monthOrderCount = tOrders.stream().filter(order -> tDriver.getId().equals(order.getDriverId())
- && order.getState().equals(OrderStateEnum.WAIT_EVALUATED.getCode()) && order.getState().equals(OrderStateEnum.FINISH.getCode())
+ && (order.getState().equals(OrderStateEnum.WAIT_EVALUATED.getCode()) || order.getState().equals(OrderStateEnum.FINISH.getCode()))
&& new SimpleDateFormat("yyyyMM").format(order.getCreateTime()).equals(monthDate)).collect(Collectors.toList());
tDriverResp.setMonthOrderCount(monthOrderCount.size());
// 拒单次数
@@ -170,11 +185,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);
}
@@ -216,10 +228,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","");
}
// 查询当前用户邀请了哪些人
@@ -234,19 +246,50 @@
if(!CollectionUtils.isEmpty(tOrders)){
//累计订单量
- List<TOrder> cumulativeOrderCount = tOrders.stream().filter(order -> order.getDriverId().equals(tDriver.getId())
- && order.getState().equals(OrderStateEnum.WAIT_EVALUATED.getCode()) && order.getState().equals(OrderStateEnum.FINISH.getCode())).collect(Collectors.toList());
+ List<TOrder> cumulativeOrderCount = tOrders.stream().filter(order -> tDriver.getId().equals(order.getDriverId())
+ && (order.getState().equals(OrderStateEnum.WAIT_EVALUATED.getCode()) || order.getState().equals(OrderStateEnum.FINISH.getCode()))).collect(Collectors.toList());
model.addAttribute("cumulativeOrderCount",cumulativeOrderCount.size());
//当月订单量
- List<TOrder> monthOrderCount = tOrders.stream().filter(order -> order.getDriverId().equals(tDriver.getId())
- && order.getState().equals(OrderStateEnum.WAIT_EVALUATED.getCode()) && order.getState().equals(OrderStateEnum.FINISH.getCode())
+ List<TOrder> monthOrderCount = tOrders.stream().filter(order -> tDriver.getId().equals(order.getDriverId())
+ && (order.getState().equals(OrderStateEnum.WAIT_EVALUATED.getCode()) || order.getState().equals(OrderStateEnum.FINISH.getCode()))
&& new SimpleDateFormat("yyyyMM").format(order.getCreateTime()).equals(monthDate)).collect(Collectors.toList());
model.addAttribute("monthOrderCount",monthOrderCount.size());
// 拒单次数
List<TOrderRefusal> driverRefusalList = tOrderRefusalMapper.selectList(new EntityWrapper<TOrderRefusal>().eq("driver_id", tDriver.getId()));
model.addAttribute("refusalCount",driverRefusalList.size());
- // todo 累计收入
- model.addAttribute("cumulativeIncome",0);
+ // 累计收入 司机提现记录加上余额减去充值金额，为累计收入
+ List<TCashWithdrawal> tCashWithdrawals = tCashWithdrawalMapper.selectList(new EntityWrapper<TCashWithdrawal>()
+ .eq("type", UserTypeEnum.DRIVER.getCode())
+ .eq("userDriverId", tDriver.getId())
+ .eq("state", 2));
+ BigDecimal balance = tDriver.getBalance();
+// if(!CollectionUtils.isEmpty(tCashWithdrawals)){
+// Optional<BigDecimal> reduce = tCashWithdrawals.stream().map(TCashWithdrawal::getAmount).reduce(BigDecimal::add);
+// if(reduce.isPresent()){
+// balance = balance.add(reduce.get());
+// }
+// }
+// List<TRechargeRecord> tRechargeRecords = tRechargeRecordMapper.selectList(new EntityWrapper<TRechargeRecord>()
+// .eq("type", UserTypeEnum.DRIVER.getCode())
+// .eq("userId", tDriver.getId())
+// .eq("payType", 1)
+// .eq("payStatus", PayStatusEnum.FINISH.getCode()));
+// if(!CollectionUtils.isEmpty(tRechargeRecords)){
+// Optional<BigDecimal> reduce = tRechargeRecords.stream().map(TRechargeRecord::getAmount).reduce(BigDecimal::add);
+// if(reduce.isPresent()){
+// balance = balance.subtract(reduce.get());
+// }
+// }
+ List<TRevenue> tRevenues = tRevenueMapper.selectList(new EntityWrapper<TRevenue>()
+ .eq("userType", 2)
+ .eq("userId", tDriver.getId()));
+ Optional<BigDecimal> reduce = tRevenues.stream().map(TRevenue::getAmount).reduce(BigDecimal::add);
+ // 减去充值金额
+ if(reduce.isPresent()){
+ model.addAttribute("cumulativeIncome", reduce.get());
+ }else {
+ model.addAttribute("cumulativeIncome",0);
+ }
}else {
model.addAttribute("cumulativeOrderCount",0);
model.addAttribute("monthOrderCount",0);
@@ -257,11 +300,9 @@
}
@Override
- public JSONObject ocr(String imgUrl) {
- File file = new File(imgUrl);
+ public JSONObject ocr(File file) {
String result = httpUtils.ocr("2", file);
- JSONObject jsonObject = JSONObject.parseObject(result);
- return jsonObject;
+ return JSONObject.parseObject(result);
}
@Override
@@ -458,4 +499,38 @@
// commissionResp.setAccumulatedCommission(BigDecimal.ZERO);
}
+
+ @Override
+ public void getDataStatistics(Integer agentId, Model model,Map<String, Object> map) {
+ // 司机总数
+ Integer driverTotal = tDriverMapper.selectCount(new EntityWrapper<TDriver>()
+ .eq("agentId", agentId));
+ // 司机最近一月数量
+ LocalDate now = LocalDate.now();
+ LocalDate localDate = now.plusMonths(1);
+ Integer driverMonthTotal = tDriverMapper.selectCount(new EntityWrapper<TDriver>()
+ .eq("agentId", agentId)
+ .between("createTime", localDate, now));
+ model.addAttribute("driverTotal",driverTotal);
+ model.addAttribute("driverMonthTotal",driverMonthTotal);
+ map.put("driverTotal",driverTotal);
+ map.put("driverMonthTotal",driverMonthTotal);
+ }
+
+ @Override
+ public void getDataStatisticsByIds(List<Integer> ids, Model model, Map<String, Object> map) {
+ // 司机总数
+ Integer driverTotal = tDriverMapper.selectCount(new EntityWrapper<TDriver>()
+ .in("agentId", ids));
+ // 司机最近一月数量
+ LocalDate now = LocalDate.now();
+ LocalDate localDate = now.plusMonths(1);
+ Integer driverMonthTotal = tDriverMapper.selectCount(new EntityWrapper<TDriver>()
+ .in("agentId", ids)
+ .between("createTime", localDate, now));
+ model.addAttribute("driverTotal",driverTotal);
+ model.addAttribute("driverMonthTotal",driverMonthTotal);
+ map.put("driverTotal",driverTotal);
+ map.put("driverMonthTotal",driverMonthTotal);
+ }
}
--
Gitblit v1.7.1