From 52e0da173b73dbed95b554b96ab6e095935fdf13 Mon Sep 17 00:00:00 2001
From: liujie <1793218484@qq.com>
Date: 星期四, 30 四月 2026 00:04:00 +0800
Subject: [PATCH] update
---
UserYKDTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/taxi/service/impl/OrderTaxiServiceImpl.java | 3 +--
1 files changed, 1 insertions(+), 2 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 67ae9aa..39a0457 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
@@ -2112,7 +2112,6 @@
private boolean isTaxiPrepayFinalStage(OrderTaxi orderTaxi) {
return orderTaxi != null
- && Integer.valueOf(1).equals(orderTaxi.getPaymentMode())
&& !Integer.valueOf(5).equals(orderTaxi.getPrepayStage());
}
@@ -2136,7 +2135,7 @@
if (paymentRecord != null && paymentRecord.getAmount() != null && paymentRecord.getAmount() > 0) {
return toMoney(paymentRecord.getAmount());
}
- if (orderTaxi.getPayMoney() != null && orderTaxi.getPayMoney() > 0) {
+ if (Integer.valueOf(1).equals(orderTaxi.getPaymentMode()) && orderTaxi.getPayMoney() != null && orderTaxi.getPayMoney() > 0) {
return toMoney(orderTaxi.getPayMoney());
}
return BigDecimal.ZERO.setScale(2, RoundingMode.HALF_UP);
--
Gitblit v1.7.1