From 577b568ded371f09cb13ea62de95d8e1f583bf65 Mon Sep 17 00:00:00 2001
From: liujie <1793218484@qq.com>
Date: 星期四, 30 四月 2026 00:18:11 +0800
Subject: [PATCH] update
---
UserYKDTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/specialTrain/server/impl/OrderPrivateCarServiceImpl.java | 8 ++++++--
UserYKDTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/taxi/service/impl/OrderTaxiServiceImpl.java | 8 ++++++--
2 files changed, 12 insertions(+), 4 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 69925f5..980e3e1 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
@@ -2614,7 +2614,7 @@
private boolean isPrivateCarPrepayFinalStage(OrderPrivateCar orderPrivateCar) {
return orderPrivateCar != null
- && !Integer.valueOf(5).equals(orderPrivateCar.getPrepayStage());
+ && Integer.valueOf(7).equals(orderPrivateCar.getState());
}
private BigDecimal toMoney(Double amount) {
@@ -2625,6 +2625,9 @@
PaymentRecord paymentRecord = paymentRecordService.query(1, orderPrivateCar.getUserId(), 1, orderPrivateCar.getId(), 1, orderPrivateCar.getPayType(), 2);
if (paymentRecord == null) {
paymentRecord = paymentRecordService.query(1, orderPrivateCar.getUserId(), 1, orderPrivateCar.getId(), 1, null, 2);
+ }
+ if (paymentRecord == null) {
+ paymentRecord = paymentRecordService.query(1, null, null, orderPrivateCar.getId(), 1, null, 2);
}
if (paymentRecord != null && orderPrivateCar.getPayType() == null) {
orderPrivateCar.setPayType(paymentRecord.getPayType());
@@ -2637,7 +2640,8 @@
if (paymentRecord != null && paymentRecord.getAmount() != null && paymentRecord.getAmount() > 0) {
return toMoney(paymentRecord.getAmount());
}
- if (Integer.valueOf(1).equals(orderPrivateCar.getPaymentMode()) && orderPrivateCar.getPayMoney() != null && orderPrivateCar.getPayMoney() > 0) {
+ if ((Integer.valueOf(1).equals(orderPrivateCar.getPaymentMode()) || (orderPrivateCar.getPrepayStage() != null && orderPrivateCar.getPrepayStage() > 0))
+ && orderPrivateCar.getPayMoney() != null && orderPrivateCar.getPayMoney() > 0) {
return toMoney(orderPrivateCar.getPayMoney());
}
return BigDecimal.ZERO.setScale(2, RoundingMode.HALF_UP);
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 39a0457..e9d1bb2 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,7 @@
private boolean isTaxiPrepayFinalStage(OrderTaxi orderTaxi) {
return orderTaxi != null
- && !Integer.valueOf(5).equals(orderTaxi.getPrepayStage());
+ && Integer.valueOf(7).equals(orderTaxi.getState());
}
private BigDecimal toMoney(Double amount) {
@@ -2123,6 +2123,9 @@
PaymentRecord paymentRecord = paymentRecordService.query(1, orderTaxi.getUserId(), 1, orderTaxi.getId(), 2, orderTaxi.getPayType(), 2);
if (paymentRecord == null) {
paymentRecord = paymentRecordService.query(1, orderTaxi.getUserId(), 1, orderTaxi.getId(), 2, null, 2);
+ }
+ if (paymentRecord == null) {
+ paymentRecord = paymentRecordService.query(1, null, null, orderTaxi.getId(), 2, null, 2);
}
if (paymentRecord != null && orderTaxi.getPayType() == null) {
orderTaxi.setPayType(paymentRecord.getPayType());
@@ -2135,7 +2138,8 @@
if (paymentRecord != null && paymentRecord.getAmount() != null && paymentRecord.getAmount() > 0) {
return toMoney(paymentRecord.getAmount());
}
- if (Integer.valueOf(1).equals(orderTaxi.getPaymentMode()) && orderTaxi.getPayMoney() != null && orderTaxi.getPayMoney() > 0) {
+ if ((Integer.valueOf(1).equals(orderTaxi.getPaymentMode()) || (orderTaxi.getPrepayStage() != null && orderTaxi.getPrepayStage() > 0))
+ && orderTaxi.getPayMoney() != null && orderTaxi.getPayMoney() > 0) {
return toMoney(orderTaxi.getPayMoney());
}
return BigDecimal.ZERO.setScale(2, RoundingMode.HALF_UP);
--
Gitblit v1.7.1