From 5470d21a35286abe41fafc25a7deaabefd7c55da Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期二, 28 五月 2024 14:30:21 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 DriverNTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/specialTrain/server/impl/OrderPrivateCarServiceImpl.java |   20 ++++++++++++++++++++
 1 files changed, 20 insertions(+), 0 deletions(-)

diff --git a/DriverNTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/specialTrain/server/impl/OrderPrivateCarServiceImpl.java b/DriverNTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/specialTrain/server/impl/OrderPrivateCarServiceImpl.java
index 8aeb8c5..e6cb0b7 100644
--- a/DriverNTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/specialTrain/server/impl/OrderPrivateCarServiceImpl.java
+++ b/DriverNTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/specialTrain/server/impl/OrderPrivateCarServiceImpl.java
@@ -21,6 +21,7 @@
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
+import org.springframework.util.StringUtils;
 
 import javax.annotation.Resource;
 import java.math.BigDecimal;
@@ -305,6 +306,15 @@
                 orderPrivateCar.setGetoffAddress(address);
                 orderPrivateCar.setGetoffTime(new Date());
                 orderPrivateCar.setEndServiceTime(new Date());
+
+//                //设置结束的时候的经纬度
+//                if (orderPrivateCar.getEndLat()!=null){
+//                        orderPrivateCar.setEndLon(lon);
+//                        orderPrivateCar.setEndLat(lat);
+//                        orderPrivateCar.setEndAddress(address);
+//                }
+
+
                 break;
         }
         this.updateById(orderPrivateCar);
@@ -322,6 +332,16 @@
             }
         }).start();
         return ResultUtil.success();
+    }   @Override
+    public ResultUtil specail(Integer orderId, Double lon, Double lat, String endAddress) throws Exception {
+        OrderPrivateCar orderPrivateCar = this.selectById(orderId);
+                        orderPrivateCar.setEndLon(lon);
+                        orderPrivateCar.setEndLat(lat);
+                        orderPrivateCar.setEndAddress(endAddress);
+
+
+        this.updateById(orderPrivateCar);
+        return ResultUtil.success();
     }
 
 

--
Gitblit v1.7.1