From b13b7bbe2efb23cdc76ea8bffb4378bfb31fac87 Mon Sep 17 00:00:00 2001
From: yanderong <307678080@qq.com>
Date: 星期四, 09 七月 2026 15:31:21 +0800
Subject: [PATCH] feat: 订单预付阶段空指针处理
---
UserYKDTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/specialTrain/server/impl/OrderPrivateCarServiceImpl.java | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/UserYKDTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/specialTrain/server/impl/OrderPrivateCarServiceImpl.java b/UserYKDTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/specialTrain/server/impl/OrderPrivateCarServiceImpl.java
index f411f68..a584289 100644
--- a/UserYKDTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/specialTrain/server/impl/OrderPrivateCarServiceImpl.java
+++ b/UserYKDTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/specialTrain/server/impl/OrderPrivateCarServiceImpl.java
@@ -2091,7 +2091,7 @@
if (prepaySettleResult != null) {
return prepaySettleResult;
}
- if (orderPrivateCar.getPrepayStage() == 3){
+ if (Objects.nonNull(orderPrivateCar.getPrepayStage()) && orderPrivateCar.getPrepayStage() == 3){
orderMoney = orderMoney - orderPrivateCar.getEstimateAmount();
}
}
@@ -2315,7 +2315,7 @@
}
}
- if (userTaxiCard.getType() == 4) {//打折天数卡{"businessTypes":[1,2,3],"discount":5,"timeQuantum":["08:00:00 - 09:00:00","17:00:00 - 18:00:00"]}
+ if (Objects.nonNull(userTaxiCard.getType()) && userTaxiCard.getType() == 4) {//打折天数卡{"businessTypes":[1,2,3],"discount":5,"timeQuantum":["08:00:00 - 09:00:00","17:00:00 - 18:00:00"]}
Double discount = jsonObject.getDouble("discount");//折扣
JSONArray timeQuantum = jsonObject.getJSONArray("timeQuantum");//使用时间段
SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
@@ -2361,7 +2361,7 @@
orderMoney = v;
}
}
- if (orderPrivateCar.getPrepayStage() == 3){
+ if (Objects.nonNull(orderPrivateCar.getPrepayStage()) && orderPrivateCar.getPrepayStage() == 3){
orderMoney = orderMoney - orderPrivateCar.getEstimateAmount();
}
orderMoney = new BigDecimal(orderMoney).setScale(2, RoundingMode.HALF_UP).doubleValue();
--
Gitblit v1.7.1