From 6a90f2d1feaf583c211d5f9fe95dff7f7c748ed3 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期五, 06 九月 2024 17:42:20 +0800
Subject: [PATCH] Merge branch '2.0' of http://120.76.84.145:10101/gitblit/r/java/IgoTravel into 2.0
---
DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/SettlementRecordServiceImpl.java | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/SettlementRecordServiceImpl.java b/DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/SettlementRecordServiceImpl.java
index 7f03fc2..91c4677 100644
--- a/DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/SettlementRecordServiceImpl.java
+++ b/DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/SettlementRecordServiceImpl.java
@@ -79,11 +79,11 @@
querySettlementAmount.setAmount(new BigDecimal(sum).add(new BigDecimal(sum1)).setScale(2, RoundingMode.HALF_EVEN).doubleValue());
List<Integer> collect = settlementRecords.stream().map(SettlementRecord::getId).collect(Collectors.toList());
- Wrapper<SettlementDetail> wrapper = new EntityWrapper<SettlementDetail>().eq("driverId", driverId);
+ Wrapper<SettlementDetail> wrapper = new EntityWrapper<SettlementDetail>();
if(collect.size() > 0){
- wrapper.in("settlementRecordId", collect).or().isNull("settlementRecordId");
+ wrapper.eq("driverId", driverId).in("settlementRecordId", collect).or().eq("driverId", driverId).isNull("settlementRecordId");
}else{
- wrapper.isNull("settlementRecordId");
+ wrapper.eq("driverId", driverId).isNull("settlementRecordId");
}
settlementDetailList = settlementDetailService.selectList(wrapper.orderBy("createTime desc"));
SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm");
--
Gitblit v1.7.1