qichexitong/car-system-api
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix null

Browse Source
This commit is contained in:
huahua
2024-07-27 16:26:27 +08:00
parent 936a878af7
commit 642a93aee4
1 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
lxk-service/src/main/java/com/zbkj/service/service/impl/CarReservationOrderServiceImpl.java
View File

@@ -4131,6 +4131,9 @@ public class CarReservationOrderServiceImpl extends ServiceImpl<CarReservationOr
qw.select("SUM(CASE WHEN new_total_over_price IS NOT NULL AND new_total_over_price <> 0 THEN new_total_over_price ELSE total_over_price END) total_over_price");
qw.in("car_reservation_order_id", orderIdList);
CarReservationInfo info = carReservationInfoService.getOne(qw);
if (info == null) {
return BigDecimal.ZERO;
}
return info.getTotalOverPrice();
}
@@ -4176,7 +4179,7 @@ public class CarReservationOrderServiceImpl extends ServiceImpl<CarReservationOr
}
lqw.eq(CarReservationOrder::getAuditStatus, CarConstants.APPLY_STATUS_1);
lqw.eq(CarReservationOrder::getIsArrived, Boolean.TRUE);
lqw.eq(CarReservationOrder::getIsPickUp, Boolean.TRUE);
// lqw.eq(CarReservationOrder::getIsPickUp, Boolean.TRUE);
// lqw.eq(CarReservationOrder::getIsDamage, Boolean.TRUE);
// lqw.eq(CarReservationOrder::getIsBilled, Boolean.TRUE);
lqw.in(CarReservationOrder::getBillAuditStatus, CarConstants.APPLY_STATUS_1, CarConstants.APPLY_STATUS_0);