From 818937959bb19d3669585fa87a526bffe9ce77a4 Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期四, 24 四月 2025 09:28:41 +0800
Subject: [PATCH] 修改默认验证码
---
DriverOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/OrderServiceImpl.java | 18 +++++++++++++-----
1 files changed, 13 insertions(+), 5 deletions(-)
diff --git a/DriverOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/OrderServiceImpl.java b/DriverOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/OrderServiceImpl.java
index 7ebfd2c..e45ac73 100644
--- a/DriverOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/OrderServiceImpl.java
+++ b/DriverOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/OrderServiceImpl.java
@@ -35,6 +35,8 @@
@Service
public class OrderServiceImpl implements IOrderService {
+
+
@Resource
private IOrderTaxiService orderTaxiService;
@@ -308,15 +310,21 @@
}
}
break;
+
+
case 2://出租
map = orderTaxiService.queryPushOrder(orderId);
- String order1 = String.valueOf(map.get("startLon")) + "," + String.valueOf(map.get("startLat"));
- String distance1 = gdMapElectricFenceUtil.getDistance(lon + "," + lat, order1, 1).get("distance");
+ System.err.println("订单数据");
+ System.err.println(map);
+ String order1 = String.valueOf(map.get("startLat")) + "," + String.valueOf(map.get("startLon"));
+ System.err.println("订单经纬度");
+ System.err.println(order1);
+ String distance1 = gdMapElectricFenceUtil.getDistance(lat + "," + lon, order1, 1).get("distance");
map.put("startDistance", ToolUtil.isNotEmpty(distance1) ? Double.valueOf(distance1) / 1000 : 0);
//总距离
- String end1 = String.valueOf(map.get("endLon")) + "," + String.valueOf(map.get("endLat"));
+ String end1 = String.valueOf(map.get("endLat")) + "," + String.valueOf(map.get("endLon"));
if(end1.equals(",")){
map.put("totalDistance", 0);
}else{
@@ -945,14 +953,14 @@
break;
case 2:
OrderTaxi orderTaxi = orderTaxiService.selectById(orderId);
- Map<String, String> distance1 = gdMapElectricFenceUtil.getDistance(lon + "," + lat, orderTaxi.getStartLon() + "," + orderTaxi.getStartLat(), 1);
+ Map<String, String> distance1 = gdMapElectricFenceUtil.getDistance(lat + "," + lon, orderTaxi.getStartLat() + "," + orderTaxi.getStartLon(), 1);
Double d1 = null != distance1 ? (Double.valueOf(String.valueOf(distance1.get("distance"))) / 1000) : 0;
if(ToolUtil.isEmpty(orderTaxi.getEndLon())){
/*Map<String, String> distance1_ = gdMapElectricFenceUtil.getDistance(orderTaxi.getStartLon() + "," + orderTaxi.getStartLat(), orderTaxi.getEndLon() + "," + orderTaxi.getEndLat(), 1);
Double d1_ = null != distance1_ ? (Double.valueOf(String.valueOf(distance1_.get("distance"))) / 1000) : 0;*/
content = (orderTaxi.getOrderType() == 1 ? "实时单" : "预约单") + "，距您约" + d1 + "公里。";
}else{
- Map<String, String> distance1_ = gdMapElectricFenceUtil.getDistance(orderTaxi.getStartLon() + "," + orderTaxi.getStartLat(), orderTaxi.getEndLon() + "," + orderTaxi.getEndLat(), 1);
+ Map<String, String> distance1_ = gdMapElectricFenceUtil.getDistance(orderTaxi.getStartLat() + "," + orderTaxi.getStartLon(), orderTaxi.getEndLat() + "," + orderTaxi.getEndLon(), 1);
Double d1_ = null != distance1_ ? (Double.valueOf(String.valueOf(distance1_.get("distance"))) / 1000) : 0;
content = (orderTaxi.getOrderType() == 1 ? "实时单" : "预约单") + "，距您约" + d1 + "公里，从" + orderTaxi.getStartAddress() + "到" + orderTaxi.getEndAddress() + "，全程" + d1_ + "公里。";
}
--
Gitblit v1.7.1