From 6408a348e14193b0f625673d4e4b22b9fbd1e369 Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期五, 08 八月 2025 18:10:15 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
DriverZYTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/specialTrain/server/impl/OrderPrivateCarServiceImpl.java | 9 +++++++++
1 files changed, 9 insertions(+), 0 deletions(-)
diff --git a/DriverZYTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/specialTrain/server/impl/OrderPrivateCarServiceImpl.java b/DriverZYTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/specialTrain/server/impl/OrderPrivateCarServiceImpl.java
index 5518188..48e6314 100644
--- a/DriverZYTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/specialTrain/server/impl/OrderPrivateCarServiceImpl.java
+++ b/DriverZYTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/specialTrain/server/impl/OrderPrivateCarServiceImpl.java
@@ -703,6 +703,14 @@
map.put("couponMoney", orderPrivateCar.getCouponMoney());//优惠券抵扣金额
map.put("discountMoney", orderPrivateCar.getDiscountMoney());//折扣抵扣金额
map.put("discount", orderPrivateCar.getDiscount());//折扣
+ if(Objects.isNull(orderPrivateCar.getEstimatedPrice())){
+ orderPrivateCar.setEstimatedPrice(BigDecimal.ZERO);
+ }
+ if(BigDecimal.valueOf(orderPrivateCar.getOrderMoney()).subtract(orderPrivateCar.getEstimatedPrice()).abs().doubleValue() > 3){
+ orderPrivateCar.setIsException(1);
+ }
+ map.put("estimatedPrice", orderPrivateCar.getEstimatedPrice());
+ map.put("isException", orderPrivateCar.getIsException());//是否异常
return map;
}
@@ -993,6 +1001,7 @@
orderPrivateCar.setPriceType(priceType);
orderPrivateCar.setUpdatePrice(updatePrice);
orderPrivateCar.setPriceAuditState(1);
+ orderPrivateCar.setState(6);
this.updateById(orderPrivateCar);
}
}
--
Gitblit v1.7.1