From af335bf1ef9104dc62c721e142eca790356d18b6 Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期三, 02 四月 2025 09:42:25 +0800
Subject: [PATCH] 修改bug
---
ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/PlatformController.java | 124 ++++++++++++++++++++++++++---------------
1 files changed, 79 insertions(+), 45 deletions(-)
diff --git a/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/PlatformController.java b/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/PlatformController.java
index af20a78..0169e04 100644
--- a/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/PlatformController.java
+++ b/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/PlatformController.java
@@ -188,9 +188,20 @@
}
EntityWrapper<SettlementDetail> settlementDetailEntityWrapper = new EntityWrapper<>();
- settlementDetailEntityWrapper.between("createTime", start, end);
if (state!=null && state == 2){
- settlementDetailEntityWrapper.eq("paymentStatus", 2);
+ List<SettlementRecord> paymentStatus = settlementRecordService.selectList(new EntityWrapper<SettlementRecord>().eq("paymentStatus", 1));
+ if(paymentStatus.size() > 0){
+ settlementDetailEntityWrapper.in("settlementRecordId", paymentStatus.stream().map(SettlementRecord::getId).collect(Collectors.toList()));
+ }else{
+ settlementDetailEntityWrapper.eq("settlementRecordId", 0);
+ }
+ }else if (state!=null && state == 1){
+ List<SettlementRecord> paymentStatus = settlementRecordService.selectList(new EntityWrapper<SettlementRecord>().eq("paymentStatus", 2));
+ if(paymentStatus.size() > 0){
+ settlementDetailEntityWrapper.in("settlementRecordId", paymentStatus.stream().map(SettlementRecord::getId).collect(Collectors.toList()));
+ }else{
+ settlementDetailEntityWrapper.eq("settlementRecordId", 0);
+ }
}
if (time == 5 && !StringUtils.hasLength(insertTime)){
@@ -200,12 +211,16 @@
settlementDetails = settlementDetailService.selectList(settlementDetailEntityWrapper);
List<PlatformVO> res = new ArrayList<>();
SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
- Map<Integer, TDriver> driverMap = driverService.selectList(new EntityWrapper<TDriver>())
- .stream()
- .collect(Collectors.toMap(TDriver::getId, user -> user));
+
Map<Integer, SettlementRecord> settlementRecordMap = settlementRecordService.selectList(new EntityWrapper<SettlementRecord>())
.stream()
.collect(Collectors.toMap(SettlementRecord::getId, user -> user));
+ Map<Integer, TOrderPrivateCar> orderPrivateCarMap = orderPrivateCarService.selectList(new EntityWrapper<TOrderPrivateCar>())
+ .stream()
+ .collect(Collectors.toMap(TOrderPrivateCar::getId, user -> user));
+ Map<Integer, TOrderLogistics> orderLogisticsRecordMap = orderLogisticsService.selectList(new EntityWrapper<TOrderLogistics>())
+ .stream()
+ .collect(Collectors.toMap(TOrderLogistics::getId, user -> user));
// 已结算金额
BigDecimal balance = new BigDecimal("0");
// 未结算金额
@@ -221,10 +236,7 @@
}
// 查询订单信息
// TOrderPrivateCar tOrderPrivateCar = orderPrivateCarService.selectById(income.getIncomeId());
- TOrderPrivateCar tOrderPrivateCar = orderPrivateCarService.selectOne(new EntityWrapper<TOrderPrivateCar>()
- .eq("id", income.getIncomeId())
- .between("insertTime", start, end));
-
+ TOrderPrivateCar tOrderPrivateCar = orderPrivateCarMap.get(income.getIncomeId());
if (tOrderPrivateCar==null){
continue;
}
@@ -244,9 +256,9 @@
// 小件物流
// 查询订单信息
// TOrderLogistics tOrderLogistics = orderLogisticsService.selectById(income.getIncomeId());
- TOrderLogistics tOrderLogistics = orderLogisticsService.selectOne(new EntityWrapper<TOrderLogistics>()
- .eq("id", income.getIncomeId())
- .between("insertTime", start, end));
+
+ TOrderLogistics tOrderLogistics = orderLogisticsRecordMap.get(income.getIncomeId());
+
if (tOrderLogistics==null){
continue;
}
@@ -268,10 +280,8 @@
switch (settlementDetail.getOrderType()){
case 1:
// 专车订单
-// TOrderPrivateCar tOrderPrivateCar = orderPrivateCarService.selectById(settlementDetail.getOrderId());
- TOrderPrivateCar tOrderPrivateCar = orderPrivateCarService.selectOne(new EntityWrapper<TOrderPrivateCar>()
- .eq("id", settlementDetail.getOrderId())
- .between("insertTime", start, end));
+ TOrderPrivateCar tOrderPrivateCar = orderPrivateCarMap.get(settlementDetail.getOrderId());
+
if (tOrderPrivateCar==null){
continue;
}
@@ -310,10 +320,8 @@
case 4:
// 小件物流
// 查询订单信息
-// TOrderLogistics tOrderLogistics = orderLogisticsService.selectById(settlementDetail.getOrderId());
- TOrderLogistics tOrderLogistics = orderLogisticsService.selectOne(new EntityWrapper<TOrderLogistics>()
- .eq("id", settlementDetail.getOrderId())
- .between("insertTime", start, end));
+ TOrderLogistics tOrderLogistics = orderLogisticsRecordMap.get(settlementDetail.getOrderId());
+
if (tOrderLogistics==null){
continue;
}
@@ -1775,7 +1783,6 @@
break;
}
}
- Page<Map<String,Object>> page = new PageFactory<Map<String,Object>>().defaultPage();
List<Income> incomes = new ArrayList<>();
List<SettlementDetail> settlementDetails = new ArrayList<>();
if (time == 5 && !StringUtils.hasLength(insertTime)){
@@ -1794,9 +1801,23 @@
}
EntityWrapper<SettlementDetail> settlementDetailEntityWrapper = new EntityWrapper<>();
- settlementDetailEntityWrapper.between("createTime", start, end);
+// settlementDetailEntityWrapper.between("createTime", start, end);
if (state!=null && state == 2){
- settlementDetailEntityWrapper.eq("paymentStatus", 2);
+ List<SettlementRecord> paymentStatus = settlementRecordService.selectList(new EntityWrapper<SettlementRecord>().eq("paymentStatus", 1));
+ if(paymentStatus.size() > 0){
+ settlementDetailEntityWrapper.in("settlementRecordId", paymentStatus.stream().map(SettlementRecord::getId).collect(Collectors.toList()))
+ .or().isNull("settlementRecordId");
+ }else{
+ settlementDetailEntityWrapper.eq("settlementRecordId", 0);
+ }
+ }else if (state!=null && state == 1){
+ List<SettlementRecord> paymentStatus = settlementRecordService.selectList(new EntityWrapper<SettlementRecord>().eq("paymentStatus", 2));
+ if(paymentStatus.size() > 0){
+ settlementDetailEntityWrapper.in("settlementRecordId", paymentStatus.stream().map(SettlementRecord::getId).collect(Collectors.toList()))
+ .or().isNull("settlementRecordId");;
+ }else{
+ settlementDetailEntityWrapper.eq("settlementRecordId", 0);
+ }
}
if (time == 5 && !StringUtils.hasLength(insertTime)){
@@ -1818,6 +1839,30 @@
Map<Integer, SettlementDetail> settlementDetailMap = settlementDetailService.selectList(new EntityWrapper<SettlementDetail>())
.stream()
.collect(Collectors.toMap(SettlementDetail::getId, user -> user));
+ Map<Integer, TOrderPrivateCar> orderPrivateCarMap = orderPrivateCarService.selectList(new EntityWrapper<TOrderPrivateCar>())
+ .stream()
+ .collect(Collectors.toMap(TOrderPrivateCar::getId, user -> user));
+ Map<Integer, TOrderLogistics> orderLogisticsRecordMap = orderLogisticsService.selectList(new EntityWrapper<TOrderLogistics>())
+ .stream()
+ .collect(Collectors.toMap(TOrderLogistics::getId, user -> user));
+ // 专车取消订单
+ Map<Integer, OrderCancel> orderCancelRecordMap1 = orderCancelService.selectList(new EntityWrapper<OrderCancel>()
+ .eq("orderType",1)
+ .eq("state",2)
+ .isNotNull("payType")
+ .isNotNull("money")
+ )
+ .stream()
+ .collect(Collectors.toMap(OrderCancel::getOrderId, user -> user));
+ // 小件物流取消
+ Map<Integer, OrderCancel> orderCancelRecordMap2 = orderCancelService.selectList(new EntityWrapper<OrderCancel>()
+ .eq("state",2)
+ .isNotNull("payType")
+ .isNotNull("money")
+ .eq("orderType",4)
+ )
+ .stream()
+ .collect(Collectors.toMap(OrderCancel::getOrderId, user -> user));
// 已结算金额
BigDecimal balance = new BigDecimal("0");
// 未结算金额
@@ -1832,10 +1877,7 @@
continue;
}
// 查询订单信息
-// TOrderPrivateCar tOrderPrivateCar = orderPrivateCarService.selectById(income.getIncomeId());
- TOrderPrivateCar tOrderPrivateCar = orderPrivateCarService.selectOne(new EntityWrapper<TOrderPrivateCar>()
- .eq("id", income.getIncomeId())
- .between("insertTime", start, end));
+ TOrderPrivateCar tOrderPrivateCar = orderPrivateCarMap.get(income.getIncomeId());
if (tOrderPrivateCar==null){
continue;
@@ -1857,9 +1899,7 @@
}
if (tOrderPrivateCar.getState() == 10){
// 查询取消订单 用户支付方式
- OrderCancel orderCancel = orderCancelService.selectOne(new EntityWrapper<OrderCancel>()
- .eq("orderType", 1)
- .eq("orderId", tOrderPrivateCar.getId()));
+ OrderCancel orderCancel = orderCancelRecordMap1.get(tOrderPrivateCar.getId());
if (orderCancel!=null &&orderCancel.getPayType()!=null){
switch (orderCancel.getPayType()){
case 1:
@@ -1904,10 +1944,9 @@
}
// 小件物流
// 查询订单信息
-// TOrderLogistics tOrderLogistics = orderLogisticsService.selectById(income.getIncomeId());
- TOrderLogistics tOrderLogistics = orderLogisticsService.selectOne(new EntityWrapper<TOrderLogistics>()
- .eq("id", income.getIncomeId())
- .between("insertTime", start, end));
+//
+ TOrderLogistics tOrderLogistics = orderLogisticsRecordMap.get(income.getIncomeId());
+
if (tOrderLogistics==null){
continue;
}
@@ -1928,9 +1967,9 @@
}
if (tOrderLogistics.getState() == 10){
// 查询取消订单 用户支付方式
- OrderCancel orderCancel = orderCancelService.selectOne(new EntityWrapper<OrderCancel>()
- .eq("orderType", 4)
- .eq("orderId", tOrderLogistics.getId()));
+
+ OrderCancel orderCancel = orderCancelRecordMap2.get(tOrderLogistics.getId());
+
if (orderCancel!=null &&orderCancel.getPayType()!=null){
switch (orderCancel.getPayType()){
case 1:
@@ -1975,10 +2014,8 @@
switch (settlementDetail.getOrderType()){
case 1:
// 专车订单
-// TOrderPrivateCar tOrderPrivateCar = orderPrivateCarService.selectById(settlementDetail.getOrderId());
- TOrderPrivateCar tOrderPrivateCar = orderPrivateCarService.selectOne(new EntityWrapper<TOrderPrivateCar>()
- .eq("id", settlementDetail.getOrderId())
- .between("insertTime", start, end));
+ TOrderPrivateCar tOrderPrivateCar = orderPrivateCarMap.get(settlementDetail.getOrderId());
+
if (tOrderPrivateCar==null){
continue;
}
@@ -2024,10 +2061,7 @@
case 4:
// 小件物流
// 查询订单信息
-// TOrderLogistics tOrderLogistics = orderLogisticsService.selectById(settlementDetail.getOrderId());
- TOrderLogistics tOrderLogistics = orderLogisticsService.selectOne(new EntityWrapper<TOrderLogistics>()
- .eq("id", settlementDetail.getOrderId())
- .between("insertTime", start, end));
+ TOrderLogistics tOrderLogistics = orderLogisticsRecordMap.get(settlementDetail.getOrderId());
if (tOrderLogistics==null){
continue;
}
--
Gitblit v1.7.1