From 582893600b9310b881c96f3ffb8ff713481b26fb Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期六, 12 四月 2025 18:13:03 +0800
Subject: [PATCH] 修改bug
---
ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/specialTrain/TReassignController.java | 86 ++++++++++++++++++++++---------------------
1 files changed, 44 insertions(+), 42 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..1aaec3e 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
@@ -4,6 +4,7 @@
import com.baomidou.mybatisplus.plugins.Page;
import com.stylefeng.guns.core.base.controller.BaseController;
import com.stylefeng.guns.core.common.constant.factory.PageFactory;
+import com.stylefeng.guns.core.log.LogObjectHolder;
import com.stylefeng.guns.core.shiro.ShiroKit;
import com.stylefeng.guns.core.shiro.ShiroUser;
import com.stylefeng.guns.core.util.SinataUtil;
@@ -15,18 +16,20 @@
import com.stylefeng.guns.modular.system.util.PushURL;
import com.stylefeng.guns.modular.system.util.ResultUtil;
import org.springframework.beans.BeanUtils;
+import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Controller;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.ResponseBody;
import org.springframework.ui.Model;
import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.beans.factory.annotation.Autowired;
-import com.stylefeng.guns.core.log.LogObjectHolder;
+import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.ResponseBody;
import javax.annotation.Resource;
import java.math.BigDecimal;
-import java.util.*;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
/**
* 专车改派管理控制器
@@ -78,8 +81,8 @@
@Autowired
private ITOrderLogisticsService orderLogisticsService;
-
-
+ @Autowired
+ private ITPubTransactionDetailsService itPubTransactionDetailsService;
/**
* 跳转到专车改派管理首页
@@ -97,7 +100,6 @@
return PREFIX + "cross.html";
}
-
/**
* 跳转到小件物流改派管理首页
*/
@@ -105,7 +107,6 @@
public String smallPieceLogistics() {
return PREFIX + "smallPieceLogistics.html";
}
-
/**
* 跳转到添加专车改派管理
@@ -143,7 +144,7 @@
model.addAttribute("tReassignId",tReassignId);
return PREFIX + "tReassign_reassignmentCross.html";
}
-
+
/**
* 跳转到修改跨城改派管理
*/
@@ -151,6 +152,14 @@
public String tReassign_reassignmentSmall(@PathVariable Integer tReassignId, Model model) {
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";
}
/**
@@ -203,7 +212,6 @@
return super.packForBT(page);
}
-
/**
* 获取跨城改派管理列表
*/
@@ -229,7 +237,6 @@
return super.packForBT(page);
}
-
/**
* 选择司机列表
*/
@@ -241,7 +248,7 @@
TReassign reassign = tReassignService.selectById(orderId);
TOrderPrivateCar privateCar = itOrderPrivateCarService.selectById(reassign.getOrderId());
Page<Map<String, Object>> page = new PageFactory<Map<String, Object>>().defaultPage();
- page.setRecords(tReassignService.getCanSelectPrivateCarDriverList(page,privateCar.getCompanyId(),name,phone));
+ page.setRecords(tReassignService.getCanSelectPrivateCarDriverList(page,privateCar.getServerCarModelId(),privateCar.getDriverId(),name,phone));
return super.packForBT(page);
}
@@ -262,7 +269,6 @@
return super.packForBT(page);
}
-
/**
* 选择司机列表
*/
@@ -274,10 +280,9 @@
TReassign reassign = tReassignService.selectById(orderId);
TOrderLogistics tOrderLogistics = orderLogisticsService.selectById(reassign.getOrderId());
Page<Map<String, Object>> page = new PageFactory<Map<String, Object>>().defaultPage();
- page.setRecords(tReassignService.getCanSelectSmallDriverList(page,tOrderLogistics.getCompanyId(), tOrderLogistics.getType(),name,phone));
+ page.setRecords(tReassignService.getCanSelectSmallDriverList(page,tOrderLogistics.getServerCarModelId(), tOrderLogistics.getDriverId(), tOrderLogistics.getType(),name,phone));
return super.packForBT(page);
}
-
/**
* 操作专车改派管理
@@ -314,8 +319,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);
@@ -349,9 +354,6 @@
// itPubTransactionDetailsService.insert(details);
return SUCCESS_TIP;
}
-
- @Autowired
- private ITPubTransactionDetailsService itPubTransactionDetailsService;
/**
* 操作跨城改派管理
@@ -476,8 +478,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 +542,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 +558,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