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/system/service/impl/OrderServiceImpl.java | 24 ++++++++++++++++++++----
1 files changed, 20 insertions(+), 4 deletions(-)
diff --git a/DriverNTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/OrderServiceImpl.java b/DriverNTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/OrderServiceImpl.java
index 74dd053..ac02be9 100644
--- a/DriverNTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/OrderServiceImpl.java
+++ b/DriverNTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/OrderServiceImpl.java
@@ -18,6 +18,7 @@
import com.stylefeng.guns.modular.system.model.Region;
import com.stylefeng.guns.modular.system.service.IDriverService;
import com.stylefeng.guns.modular.system.service.IOrderService;
+import com.stylefeng.guns.modular.system.service.ITOrderTransferService;
import com.stylefeng.guns.modular.system.util.*;
import com.stylefeng.guns.modular.system.warpper.OrderListWarpper;
import com.stylefeng.guns.modular.taxi.model.OrderTaxi;
@@ -73,6 +74,9 @@
@Autowired
private IOrderLogisticsService orderLogisticsService;
+ @Autowired
+ private ITOrderTransferService orderTransferService;
+
@Autowired
private ALiSendSms aLiSendSms;
@@ -114,6 +118,9 @@
//小件物流
List<Map<String, Object>> list3 = orderLogisticsService.queryOrderList(uid);
datas.addAll(list3);
+ //接送机
+ List<Map<String, Object>> list4 = orderTransferService.queryOrderList(state,uid);
+ datas.addAll(list4);
//分页
if(datas.size() >= page * size){
@@ -273,10 +280,15 @@
String distance = gdMapElectricFenceUtil.getDistance(lon + "," + lat, order, 1).get("distance");
map.put("startDistance", ToolUtil.isNotEmpty(distance) ? Double.valueOf(distance) / 1000 : 0);
- //总距离
- String end = String.valueOf(map.get("endLon")) + "," + String.valueOf(map.get("endLat"));
- distance = gdMapElectricFenceUtil.getDistance(end, order, 1).get("distance");
- map.put("totalDistance", ToolUtil.isNotEmpty(distance) ? Double.valueOf(distance) / 1000 : 0);
+ try {
+ //总距离
+ String end = String.valueOf(map.get("endLon")) + "," + String.valueOf(map.get("endLat"));
+ distance = gdMapElectricFenceUtil.getDistance(end, order, 1).get("distance");
+ map.put("totalDistance", ToolUtil.isNotEmpty(distance) ? Double.valueOf(distance) / 1000 : 0);
+ }catch (Exception e){
+ e.printStackTrace();
+ }
+
Integer orderSource = Integer.valueOf(String.valueOf(map.get("orderSource")));
if(orderSource == 1 || orderSource == 2 || orderSource == 3){
@@ -609,6 +621,10 @@
}
return null;
}
+ @Override
+ public ResultUtil specail(Integer orderId, Integer uid, Double lon, Double lat,String endAddress) throws Exception {
+ return orderPrivateCarService.specail(orderId, lon, lat, endAddress);
+ }
/**
--
Gitblit v1.7.1