From f3839fff3c7da7f1942cfad520cfe393def35a04 Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期三, 12 三月 2025 18:28:00 +0800
Subject: [PATCH] 修改bug
---
ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/specialTrain/TReassignController.java | 58 ++++++++++++++++++++++++++++++++++------------------------
1 files changed, 34 insertions(+), 24 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 b933f6c..791145e 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
@@ -152,7 +152,17 @@
model.addAttribute("tReassignId",tReassignId);
return PREFIX + "tReassign_reassignmentSmall.html";
}
-
+
+
+ @RequestMapping("/lookDetail/{id}")
+ public String lookDetail(@PathVariable Integer id, Model model) {
+ TReassign tReassign = tReassignService.selectById(id);
+ String str = tReassign.getReason();
+ model.addAttribute("str",str);
+ return "/system/tComplaint/lookDetail.html";
+ }
+
+
/**
* 获取专车改派管理列表
*/
@@ -314,8 +324,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);
@@ -476,8 +486,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 +550,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);
@@ -556,23 +566,23 @@
System.out.println("小件物流取消:【orderId="+tOrderLogistics.getId().toString()+"】,调用接口:"+result);
}
- //返回驾驶员处罚金
- 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(tReassign.getOrderType());
- details.setOrderId(tReassign.getOrderId());
- itPubTransactionDetailsService.insert(details);
+// //返回驾驶员处罚金
+// 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(tReassign.getOrderType());
+// details.setOrderId(tReassign.getOrderId());
+// itPubTransactionDetailsService.insert(details);
return SUCCESS_TIP;
}
--
Gitblit v1.7.1