update

liujie

2026-04-30 577b568ded371f09cb13ea62de95d8e1f583bf65

 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);