From 2ab5f166d0fad4b1a860fde3bab1adb46d062c3f Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期三, 23 七月 2025 21:18:42 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
DriverQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/taxi/service/impl/OrderTaxiServiceImpl.java | 27 ++++++++++++---------------
1 files changed, 12 insertions(+), 15 deletions(-)
diff --git a/DriverQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/taxi/service/impl/OrderTaxiServiceImpl.java b/DriverQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/taxi/service/impl/OrderTaxiServiceImpl.java
index 520e941..6f5a29e 100644
--- a/DriverQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/taxi/service/impl/OrderTaxiServiceImpl.java
+++ b/DriverQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/taxi/service/impl/OrderTaxiServiceImpl.java
@@ -31,28 +31,28 @@
@Resource
private OrderTaxiMapper orderTaxiMapper;
-
+
@Autowired
private IDriverService driverService;
-
+
@Autowired
private PushUtil pushUtil;
-
+
@Autowired
private GDFalconUtil gdFalconUtil;
- @Autowired
- private RedisTemplate redisTemplate;
-
+ @Resource
+ private RedisTemplate<String, Object> redisTemplate;
+
@Autowired
private IOrderPositionService orderPositionService;
-
+
@Autowired
private ISystemNoticeService systemNoticeService;
-
+
@Autowired
private ChinaMobileUtil chinaMobileUtil;
-
+
@Autowired
private GeodesyUtil geodesyUtil;
@@ -753,7 +753,7 @@
}else{
orderTaxi.setMileage(0D);
this.updateById(orderTaxi);
-// return true;//第一条数据不作处理，直接存储
+ return true;//第一条数据不作处理，直接存储
}
Map<String, Double> distance = geodesyUtil.getDistance(now, old);
if(null != distance){
@@ -764,13 +764,10 @@
if(orderTaxi.getState() == 5){//大于50米表示在移动,且正在服务中的时候存入里程
orderTaxi.setMileage(new BigDecimal(orderTaxi.getMileage()).add(new BigDecimal(distance1)).setScale(2, BigDecimal.ROUND_HALF_EVEN).doubleValue());
this.updateById(orderTaxi);
-// return true;
+ return true;
}
-// return false;
- }else{
- System.err.println("调用高德计算距离出错");
}
- return true;
+ return false;
}
--
Gitblit v1.7.1