From 80fd77e1bcb47726e440b8a728838189cd39a56a Mon Sep 17 00:00:00 2001
From: longz <longzhaoz@qq.com>
Date: 星期二, 30 六月 2026 21:25:35 +0800
Subject: [PATCH] 跨城改派fix
---
DriverYKDTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/api/OrderController.java | 44 ++++++++++++++++++++++++++++----------------
1 files changed, 28 insertions(+), 16 deletions(-)
diff --git a/DriverYKDTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/api/OrderController.java b/DriverYKDTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/api/OrderController.java
index c7d7f2d..33080fa 100644
--- a/DriverYKDTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/api/OrderController.java
+++ b/DriverYKDTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/api/OrderController.java
@@ -6,6 +6,7 @@
import com.stylefeng.guns.core.util.ToolUtil;
import com.stylefeng.guns.modular.crossCity.model.OrderCrossCity;
import com.stylefeng.guns.modular.crossCity.server.IOrderCrossCityService;
+import com.stylefeng.guns.modular.crossCity.warpper.LineSiteWarpper;
import com.stylefeng.guns.modular.crossCity.warpper.OrderCrossCityInfoWrapper;
import com.stylefeng.guns.modular.crossCity.warpper.OrderWarpper;
import com.stylefeng.guns.modular.smallLogistics.model.OrderLogistics;
@@ -29,10 +30,7 @@
import io.swagger.annotations.ApiImplicitParams;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.ResponseBody;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
import javax.servlet.http.HttpServletRequest;
@@ -88,15 +86,7 @@
private PayMoneyUtil payMoneyUtil;
@Autowired
- private IOrderPrivateCarService orderPrivateCarService;
-
- @Autowired
private IOrderCrossCityService orderCrossCityService;
-
- @Autowired
- private IOrderTaxiService orderTaxiService;
-
-
@@ -465,7 +455,7 @@
*/
@ResponseBody
@PostMapping("/api/order/reassign")
- @ApiOperation(value = "提交改派申请", tags = {"司机端-服务中"}, notes = "")
+ @ApiOperation(value = "提交改派申请（使用的）", tags = {"司机端-服务中"}, notes = "")
@ApiImplicitParams({
@ApiImplicitParam(value = "订单id", name = "orderId", required = true, dataType = "int"),
@ApiImplicitParam(value = "订单类型（1=专车，2=出租车，4=小件物流-同城，5=小件物流-跨城）", name = "orderType", required = true, dataType = "int"),
@@ -480,7 +470,7 @@
if(null == uid){
return ResultUtil.tokenErr();
}
- return reassignService.saveData(reassign, uid, null);
+ return reassignService.saveData(reassign, uid, null,reassign.getNowDriverId());
}catch (SystemException s){
return ResultUtil.error(s.getMsg());
} catch (Exception e){
@@ -517,6 +507,27 @@
return ResultUtil.runErr();
}
}
+
+
+ @ResponseBody
+ @RequestMapping(value = "/api/lineSite/queryDriverList", method = RequestMethod.POST)
+ @ApiOperation(value = "根据线路id获取其他线路排班数据", tags = {"司机端-跨城"}, notes = "")
+ @ApiImplicitParams({
+ @ApiImplicitParam(value = "订单", name = "orderId", required = true, dataType = "String"),
+ @ApiImplicitParam(value = "查询天（2020-09-03）", name = "day", required = true, dataType = "string")
+ })
+ public ResultUtil<List<LineSiteWarpper>> queryDriverList(String orderId){
+ try {
+ List<Map<String, Object>> list = reassignService.queryDriver(orderId);
+ return ResultUtil.success(LineSiteWarpper.getLineSiteWarppers(list));
+ } catch (Exception e){
+ e.printStackTrace();
+ return ResultUtil.runErr();
+ }
+ }
+
+
+
@@ -826,10 +837,11 @@
@ApiImplicitParam(value = "改派支付方式（1=微信，2=支付宝，3=余额）", name = "payType", required = false, dataType = "int"),
@ApiImplicitParam(value = "改派原因", name = "reason", required = true, dataType = "string"),
@ApiImplicitParam(value = "备注", name = "remark", required = false, dataType = "string"),
+ @ApiImplicitParam(value = "司机id", name = "driverId", required = false, dataType = "int"),
})
- public String reassign_(Reassign reassign, Integer uid){
+ public String reassign_(Reassign reassign, Integer uid, Integer driverId){
try {
- ResultUtil resultUtil = reassignService.saveData(reassign, uid, 3);
+ ResultUtil resultUtil = reassignService.saveData(reassign, uid, 3, driverId);
return JSON.toJSONString(resultUtil);
}catch (SystemException s){
return JSON.toJSONString(ResultUtil.error(s.getMsg()));
--
Gitblit v1.7.1