From 1130ad3b89e73f9b76292f6da391e0e04b8417dd Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期二, 03 十二月 2024 16:15:04 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
DriverZYTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/taxi/service/impl/OrderTaxiServiceImpl.java | 3 +++
1 files changed, 3 insertions(+), 0 deletions(-)
diff --git a/DriverZYTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/taxi/service/impl/OrderTaxiServiceImpl.java b/DriverZYTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/taxi/service/impl/OrderTaxiServiceImpl.java
index 7013224..8520332 100644
--- a/DriverZYTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/taxi/service/impl/OrderTaxiServiceImpl.java
+++ b/DriverZYTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/taxi/service/impl/OrderTaxiServiceImpl.java
@@ -392,6 +392,9 @@
@Override
public ResultUtil confirmFees(Integer orderId, Integer type, Double travelFee, Double parkingFee, Double crossingFee) throws Exception {
OrderTaxi orderTaxi = this.selectById(orderId);
+ if(orderTaxi.getState() != 6){
+ return ResultUtil.error("异常操作，请刷新订单");
+ }
orderTaxi.setPayManner(type);
if(type == 2){//其他支付，不需要操作，直接完成订单
orderTaxi.setOrderMoney(0D);
--
Gitblit v1.7.1