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 | 56 +++++++++++++++++++++++++++++++++++++++++++++++---------
1 files changed, 47 insertions(+), 9 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 8730343..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)){
@@ -1772,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)){
@@ -1791,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)){
@@ -1821,10 +1845,24 @@
Map<Integer, TOrderLogistics> orderLogisticsRecordMap = orderLogisticsService.selectList(new EntityWrapper<TOrderLogistics>())
.stream()
.collect(Collectors.toMap(TOrderLogistics::getId, user -> user));
- Map<Integer, OrderCancel> orderCancelRecordMap = orderCancelService.selectList(new EntityWrapper<OrderCancel>()
+ // 专车取消订单
+ Map<Integer, OrderCancel> orderCancelRecordMap1 = orderCancelService.selectList(new EntityWrapper<OrderCancel>()
+ .eq("orderType",1)
+ .eq("state",2)
+ .isNotNull("payType")
+ .isNotNull("money")
)
.stream()
- .collect(Collectors.toMap(OrderCancel::getId, user -> user));
+ .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");
// 未结算金额
@@ -1861,7 +1899,7 @@
}
if (tOrderPrivateCar.getState() == 10){
// 查询取消订单 用户支付方式
- OrderCancel orderCancel = orderCancelRecordMap.get(tOrderPrivateCar.getId());
+ OrderCancel orderCancel = orderCancelRecordMap1.get(tOrderPrivateCar.getId());
if (orderCancel!=null &&orderCancel.getPayType()!=null){
switch (orderCancel.getPayType()){
case 1:
@@ -1930,7 +1968,7 @@
if (tOrderLogistics.getState() == 10){
// 查询取消订单 用户支付方式
- OrderCancel orderCancel = orderCancelRecordMap.get(tOrderLogistics.getId());
+ OrderCancel orderCancel = orderCancelRecordMap2.get(tOrderLogistics.getId());
if (orderCancel!=null &&orderCancel.getPayType()!=null){
switch (orderCancel.getPayType()){
--
Gitblit v1.7.1