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/taxi/service/impl/OrderTaxiServiceImpl.java | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/UserYKDTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/taxi/service/impl/OrderTaxiServiceImpl.java b/UserYKDTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/taxi/service/impl/OrderTaxiServiceImpl.java
index 9a50851..4d8fc9a 100644
--- a/UserYKDTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/taxi/service/impl/OrderTaxiServiceImpl.java
+++ b/UserYKDTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/taxi/service/impl/OrderTaxiServiceImpl.java
@@ -1352,7 +1352,7 @@
return prepaySettleResult;
}
// orderMoney = getTaxiPrepayFinalPayAmount(orderTaxi, orderMoney);
- if (orderTaxi.getPrepayStage() == 3){
+ if (Objects.nonNull(orderTaxi.getPrepayStage()) && orderTaxi.getPrepayStage() == 3){
orderMoney = orderMoney - orderTaxi.getEstimateAmount();
}
orderMoney = orderMoney < 0 ? 0 : orderMoney;
@@ -1610,7 +1610,7 @@
orderMoney = v;
}
}
- if (orderTaxi.getPrepayStage() == 3){
+ if (Objects.nonNull(orderTaxi.getPrepayStage()) && orderTaxi.getPrepayStage() == 3){
orderMoney = orderMoney - orderTaxi.getEstimateAmount();
}
orderMoney = orderMoney < 0 ? 0 : orderMoney;
@@ -2244,7 +2244,7 @@
Double displayAmount = getTaxiPrepayDisplayPayAmount(orderTaxi, finalAmount);
map.put("orderMoney", finalAmount);
map.put("payMoney", displayAmount);
- if (orderTaxi.getPrepayStage() == 3) {
+ if (Objects.nonNull(orderTaxi.getPrepayStage()) && orderTaxi.getPrepayStage() == 3) {
map.put("payMoney", new BigDecimal(finalAmount)
.subtract(new BigDecimal(orderTaxi.getEstimateAmount() != null ? orderTaxi.getEstimateAmount() : 0))
.setScale(2, RoundingMode.HALF_UP));
--
Gitblit v1.7.1