From 67ac6f18da66cc5b703e1ec849e96bdac586d6d1 Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期三, 10 五月 2023 18:16:26 +0800
Subject: [PATCH] BUG修改
---
management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/TDriverServiceImpl.java | 50 ++++++++++++++++++++++++++++----------------------
1 files changed, 28 insertions(+), 22 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 b44288e..9adcdc1 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
@@ -70,6 +70,8 @@
@Autowired
private TRegionMapper tRegionMapper;
@Autowired
+ private TRevenueMapper tRevenueMapper;
+ @Autowired
private ITRegionService itRegionService;
@Autowired
private HttpUtils httpUtils;
@@ -140,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());
// 拒单次数
@@ -248,11 +250,11 @@
if(!CollectionUtils.isEmpty(tOrders)){
//累计订单量
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());
model.addAttribute("cumulativeOrderCount",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());
model.addAttribute("monthOrderCount",monthOrderCount.size());
// 拒单次数
@@ -264,25 +266,29 @@
.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());
- }
- }
+// 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);
// 减去充值金额
- model.addAttribute("cumulativeIncome",balance);
+ reduce.ifPresent(bigDecimal -> model.addAttribute("cumulativeIncome", bigDecimal));
}else {
model.addAttribute("cumulativeOrderCount",0);
model.addAttribute("monthOrderCount",0);
--
Gitblit v1.7.1