From 73b750200f25df08aa64124da49e7461f9de6653 Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期五, 13 十二月 2024 15:09:49 +0800
Subject: [PATCH] Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/NTTravel
---
DriverNTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/api/OrderController.java | 19 +++++++++++--------
1 files changed, 11 insertions(+), 8 deletions(-)
diff --git a/DriverNTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/api/OrderController.java b/DriverNTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/api/OrderController.java
index 0d9c26d..526ad67 100644
--- a/DriverNTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/api/OrderController.java
+++ b/DriverNTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/api/OrderController.java
@@ -98,6 +98,7 @@
tape.setOrderType(orderType);
tape.setInsertTime(new Date());
tape.setAfterTime(newDate);
+ tape.setOrderId(orderId);
String[] split = fileLink.split(",");
for (String s : split) {
orderTapeService.insert(tape);
@@ -106,19 +107,19 @@
case 1:
OrderPrivateCar orderPrivateCar = privateCarService.selectById(orderId);
orderPrivateCar.setRecordTime(new Date());
- orderPrivateCar.setRouteRecord(fileLink);
+ orderPrivateCar.setRouteRecord(orderPrivateCar.getRouteRecord()==null? fileLink: orderPrivateCar.getRouteRecord()+","+fileLink);
privateCarService.updateById(orderPrivateCar);
break;
- case 5:
+ case 3:
OrderCrossCity orderCrossCity = crossCityService.selectById(orderId);
orderCrossCity.setRecordTime(new Date());
- orderCrossCity.setRouteRecord(fileLink);
+ orderCrossCity.setRouteRecord(orderCrossCity.getRouteRecord()==null? fileLink: orderCrossCity.getRouteRecord()+","+fileLink);
crossCityService.updateById(orderCrossCity);
break;
case 7:
TOrderTransfer orderTransfer = orderTransferService.selectById(orderId);
orderTransfer.setRecordTime(new Date());
- orderTransfer.setRouteRecord(fileLink);
+ orderTransfer.setRouteRecord(orderTransfer.getRouteRecord()==null? fileLink: orderTransfer.getRouteRecord()+","+fileLink);
orderTransferService.updateById(orderTransfer);
break;
}
@@ -273,7 +274,7 @@
@ApiOperation(value = "获取抢单界面的订单详情", tags = {"司机端-首页"}, notes = "")
@ApiImplicitParams({
@ApiImplicitParam(value = "订单id", name = "orderId", required = true, dataType = "int"),
- @ApiImplicitParam(value = "订单类型（1=专车，2=出租车，3=城际，4=小件物流-同城，5=小件物流-跨城）", name = "orderType", required = true, dataType = "int"),
+ @ApiImplicitParam(value = "订单类型（1=专车，2=出租车，3=城际，4=小件物流-同城，5=小件物流-跨城7=接送机）", name = "orderType", required = true, dataType = "int"),
@ApiImplicitParam(value = "当前定位经度", name = "lon", required = true, dataType = "string"),
@ApiImplicitParam(value = "当前定位纬度", name = "lat", required = true, dataType = "string"),
@ApiImplicitParam(name = "Authorization", value = "Bearer +token", required = true, dataType = "String", paramType = "header", defaultValue = "Bearer eyJhbGciOiJIUzUxMiJ9.....")
@@ -301,7 +302,7 @@
@ApiOperation(value = "司机抢单操作", tags = {"司机端-首页"}, notes = "")
@ApiImplicitParams({
@ApiImplicitParam(value = "订单id", name = "orderId", required = true, dataType = "int"),
- @ApiImplicitParam(value = "订单类型（1=专车，2=出租车，3=城际，4=小件物流-同城，5=小件物流-跨城）", name = "orderType", required = true, dataType = "int"),
+ @ApiImplicitParam(value = "订单类型（1=专车，2=出租车，3=城际，4=小件物流-同城，5=小件物流-跨城 7接送机）", name = "orderType", required = true, dataType = "int"),
@ApiImplicitParam(name = "Authorization", value = "Bearer +token", required = true, dataType = "String", paramType = "header", defaultValue = "Bearer eyJhbGciOiJIUzUxMiJ9.....")
})
public ResultUtil grabOrder(Integer orderId, Integer orderType, HttpServletRequest request){
@@ -353,7 +354,7 @@
@ApiOperation(value = "获取改派支付金额", tags = {"司机端-服务中"}, notes = "返回金额为0不需要调用支付")
@ApiImplicitParams({
@ApiImplicitParam(value = "订单id（跨城多个订单使用逗号分隔）", name = "orderId", required = true, dataType = "string"),
- @ApiImplicitParam(value = "订单类型（1=专车，2=出租车，3=城际，4=小件物流-同城，5=小件物流-跨城）", name = "orderType", required = true, dataType = "int"),
+ @ApiImplicitParam(value = "订单类型（1=专车，2=出租车，3=城际，4=小件物流-同城，5=小件物流-跨城 7=接送机）", name = "orderType", required = true, dataType = "int"),
@ApiImplicitParam(name = "Authorization", value = "Bearer +token", required = true, dataType = "String", paramType = "header", defaultValue = "Bearer eyJhbGciOiJIUzUxMiJ9.....")
})
public ResultUtil<BaseWarpper> queryReassignMoney(String orderId, Integer orderType){
@@ -455,6 +456,8 @@
if(null == uid){
return ResultUtil.tokenErr();
}
+ endAddress = endAddress.replaceAll("& #40;", "\\(");
+ endAddress = endAddress.replaceAll("& #41;", "\\)");
return orderService.specail(orderId, uid, lon, lat,endAddress);
}catch (Exception e){
e.printStackTrace();
@@ -619,7 +622,7 @@
@ApiOperation(value = "提交改派申请", tags = {"司机端-服务中"}, notes = "")
@ApiImplicitParams({
@ApiImplicitParam(value = "订单id", name = "orderId", required = true, dataType = "int"),
- @ApiImplicitParam(value = "订单类型（1=专车，2=出租车，3=城际，4=小件物流-同城，5=小件物流-跨城，6=包车）", name = "orderType", required = true, dataType = "int"),
+ @ApiImplicitParam(value = "订单类型（1=专车，2=出租车，3=城际，4=小件物流-同城，5=小件物流-跨城，6=包车，7=接送机）", name = "orderType", required = true, dataType = "int"),
@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"),
--
Gitblit v1.7.1