From a5c2c7e633e0dba4b80c8a15fd34c38ae097befc Mon Sep 17 00:00:00 2001
From: zhibing.pu <393733352@qq.com>
Date: 星期五, 21 六月 2024 10:03:06 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/2.0' into 2.0
---
ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/specialTrain/TReassignController.java | 40 ++++++++++++++++++++--------------------
1 files changed, 20 insertions(+), 20 deletions(-)
diff --git a/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/specialTrain/TReassignController.java b/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/specialTrain/TReassignController.java
index 83fe944..4cc0539 100644
--- a/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/specialTrain/TReassignController.java
+++ b/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/specialTrain/TReassignController.java
@@ -314,8 +314,8 @@
OrderCancel orderCancel = new OrderCancel();
orderCancel.setOrderId(tReassign.getOrderId());
orderCancel.setOrderType(tReassign.getOrderType());
- orderCancel.setReason("调度端取消订单");
- orderCancel.setRemark("调度“" + user.getName() + "-" + user.getId() + "”执行取消操作");
+ orderCancel.setReason("The platform cancels the order");
+ orderCancel.setRemark("The platform cancels the order");
orderCancel.setState(2);
orderCancel.setInsertTime(new Date());
orderCancel.setUserType(3);
@@ -331,22 +331,22 @@
}
//返回驾驶员处罚金
- TDriver originalDriver = itDriverService.selectById(tReassign.getOriginalDriverId());
- originalDriver.setBalance(originalDriver.getBalance().add(new BigDecimal(tReassign.getMoney())));
- itDriverService.updateById(originalDriver);
+// TDriver originalDriver = itDriverService.selectById(tReassign.getOriginalDriverId());
+// originalDriver.setBalance(originalDriver.getBalance().add(new BigDecimal(tReassign.getMoney())));
+// itDriverService.updateById(originalDriver);
//增加交易明细
- TPubTransactionDetails details = new TPubTransactionDetails();
- details.setUserId(originalDriver.getId());
- details.setInsertTime(new Date());
- details.setRemark("【专车改派】:改派失败或订单取消");
- details.setMoney(new BigDecimal(tReassign.getMoney()));
- details.setState(1);
- details.setType(1);
- details.setUserType(2);
- details.setOrderType(3);
- details.setOrderId(tReassign.getOrderId());
- itPubTransactionDetailsService.insert(details);
+// TPubTransactionDetails details = new TPubTransactionDetails();
+// details.setUserId(originalDriver.getId());
+// details.setInsertTime(new Date());
+// details.setRemark("【专车改派】:改派失败或订单取消");
+// details.setMoney(new BigDecimal(tReassign.getMoney()));
+// details.setState(1);
+// details.setType(1);
+// details.setUserType(2);
+// details.setOrderType(3);
+// details.setOrderId(tReassign.getOrderId());
+// itPubTransactionDetailsService.insert(details);
return SUCCESS_TIP;
}
@@ -476,8 +476,8 @@
OrderCancel orderCancel = new OrderCancel();
orderCancel.setOrderId(tReassign.getOrderId());
orderCancel.setOrderType(tReassign.getOrderType());
- orderCancel.setReason("调度端取消订单");
- orderCancel.setRemark("调度“" + user.getName() + "-" + user.getId() + "”执行取消操作");
+ orderCancel.setReason("The platform cancels the order");
+ orderCancel.setRemark("The platform cancels the order");
orderCancel.setState(2);
orderCancel.setInsertTime(new Date());
orderCancel.setUserType(3);
@@ -540,8 +540,8 @@
OrderCancel orderCancel = new OrderCancel();
orderCancel.setOrderId(tReassign.getOrderId());
orderCancel.setOrderType(tReassign.getOrderType());
- orderCancel.setReason("调度端取消订单");
- orderCancel.setRemark("调度“" + user.getName() + "-" + user.getId() + "”执行取消操作");
+ orderCancel.setReason("The platform cancels the order");
+ orderCancel.setRemark("The platform cancels the order");
orderCancel.setState(2);
orderCancel.setInsertTime(new Date());
orderCancel.setUserType(3);
--
Gitblit v1.7.1