From 31ce6be2d56798d9509e6d90335999064351f7f3 Mon Sep 17 00:00:00 2001
From: luodangjia <luodangjia>
Date: 星期二, 10 十二月 2024 16:06:26 +0800
Subject: [PATCH] 12.10

---
 DispatchOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/OrderTransferServiceImpl.java |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/DispatchOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/OrderTransferServiceImpl.java b/DispatchOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/OrderTransferServiceImpl.java
index 678cba7..d86a9e3 100644
--- a/DispatchOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/OrderTransferServiceImpl.java
+++ b/DispatchOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/OrderTransferServiceImpl.java
@@ -72,7 +72,7 @@
 
     @Override
     public ResultUtil cancelOrder(Integer orderId) throws Exception {
-        OrderTransferCar orderPrivateCar = this.selectById(orderId);
+        OrderTransferCar orderPrivateCar = this.baseMapper.selectById(orderId);
         if(orderPrivateCar.getState() == 10 || orderPrivateCar.getState() == 12){
             return ResultUtil.error("不允许重复取消");
         }
@@ -80,12 +80,12 @@
             return ResultUtil.error("订单已完成,不允许取消");
         }
         orderPrivateCar.setState(10);
-        this.updateById(orderPrivateCar);
+        this.baseMapper.updateById(orderPrivateCar);
 
         //添加取消记录
         OrderCancel orderCancel = new OrderCancel();
         orderCancel.setOrderId(orderId);
-        orderCancel.setOrderType(1);
+        orderCancel.setOrderType(7);
         orderCancel.setReason("调度端取消");
         orderCancel.setRemark("调度端取消");
         orderCancel.setState(2);

--
Gitblit v1.7.1