From ac4eb93794e19e80f8fe69811ced84327a6a7afd Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期五, 08 八月 2025 18:09:46 +0800
Subject: [PATCH] bug修改
---
DriverZYTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/specialTrain/server/impl/OrderPrivateCarServiceImpl.java | 9 +++++++++
DriverZYTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/warpper/MoneyInfoWarpper.java | 23 +++++++++++++++++++++++
DriverZYTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/warpper/OrderListWarpper.java | 11 +++++++++++
3 files changed, 43 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);
}
}
diff --git a/DriverZYTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/warpper/MoneyInfoWarpper.java b/DriverZYTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/warpper/MoneyInfoWarpper.java
index 0d2618f..44959ef 100644
--- a/DriverZYTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/warpper/MoneyInfoWarpper.java
+++ b/DriverZYTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/warpper/MoneyInfoWarpper.java
@@ -2,6 +2,7 @@
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
+import io.swagger.models.auth.In;
import java.util.Map;
@@ -44,6 +45,26 @@
private Double discountMoney;
@ApiModelProperty("折扣")
private Double discount;
+ @ApiModelProperty("是否异常 1=是 0=否")
+ private Integer isException;
+ @ApiModelProperty("预估价")
+ private Double estimatedPrice;
+
+ public Double getEstimatedPrice() {
+ return estimatedPrice;
+ }
+
+ public void setEstimatedPrice(Double estimatedPrice) {
+ this.estimatedPrice = estimatedPrice;
+ }
+
+ public Integer getIsException() {
+ return isException;
+ }
+
+ public void setIsException(Integer isException) {
+ this.isException = isException;
+ }
public Double getOrderMoney() {
return orderMoney;
@@ -223,6 +244,8 @@
moneyInfoWarpper.setCouponMoney(null != map.get("couponMoney") ? Double.valueOf(map.get("couponMoney").toString()) : 0D);
moneyInfoWarpper.setDiscountMoney(null != map.get("discountMoney") ? Double.valueOf(map.get("discountMoney").toString()) : 0D);
moneyInfoWarpper.setDiscount(null != map.get("discount") ? Double.valueOf(map.get("discount").toString()) : 0D);
+ moneyInfoWarpper.setIsException(null != map.get("isException") ? Integer.valueOf(map.get("isException").toString()) : 0);
+ moneyInfoWarpper.setEstimatedPrice(null != map.get("estimatedPrice") ? Double.valueOf(map.get("estimatedPrice").toString()) : 0D);
}
return moneyInfoWarpper;
}
diff --git a/DriverZYTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/warpper/OrderListWarpper.java b/DriverZYTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/warpper/OrderListWarpper.java
index b94e971..ccd990d 100644
--- a/DriverZYTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/warpper/OrderListWarpper.java
+++ b/DriverZYTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/warpper/OrderListWarpper.java
@@ -37,9 +37,19 @@
private String cargoNumber;
@ApiModelProperty("备注")
private String remark;
+ @ApiModelProperty("是否预约单")
+ private Integer reservation;
@ApiModelProperty("支付方式（1=OK平台支付（线上支付），2=其他方式支付（线下支付））")
private Integer payManner;
private Long travelTime;
+
+ public Integer getReservation() {
+ return reservation;
+ }
+
+ public void setReservation(Integer reservation) {
+ this.reservation = reservation;
+ }
public Integer getId() {
return id;
@@ -200,6 +210,7 @@
orderListWarpper.setRemark(null != map.get("remark") ? String.valueOf(map.get("remark")) : "");
orderListWarpper.setPayManner(null != map.get("payManner") ? Integer.valueOf(String.valueOf(map.get("payManner"))) : 0);
orderListWarpper.setTravelTime(null != map.get("travelTime") ? Long.valueOf(String.valueOf(map.get("travelTime"))) : 0);
+ orderListWarpper.setReservation(null != map.get("reservation") ? Integer.valueOf(String.valueOf(map.get("reservation"))) : 0);
list.add(orderListWarpper);
}
}
--
Gitblit v1.7.1