From a3990d3644885c51f4ea0fc7a27c1097f4808bfb Mon Sep 17 00:00:00 2001
From: luodangjia <luodangjia>
Date: 星期四, 30 五月 2024 11:05:42 +0800
Subject: [PATCH] 5.30

---
 DriverNTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/api/OrderController.java |   10 +++++-----
 1 files changed, 5 insertions(+), 5 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..844d62a 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
@@ -106,19 +106,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:
                     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 +273,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 +301,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){

--
Gitblit v1.7.1