From c0f0b2825ed3dbef86b381c2490277164446dc10 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期六, 18 三月 2023 17:28:01 +0800
Subject: [PATCH] 新增加司机端接口
---
driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/service/impl/OrderServiceImpl.java | 54 ++++++++++++++++++++++++++++++++++++++++++++++++------
1 files changed, 48 insertions(+), 6 deletions(-)
diff --git a/driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/service/impl/OrderServiceImpl.java b/driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/service/impl/OrderServiceImpl.java
index 7838115..dcb3bf1 100644
--- a/driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/service/impl/OrderServiceImpl.java
+++ b/driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/service/impl/OrderServiceImpl.java
@@ -184,7 +184,7 @@
pushUtil.pushOrderStatus(uid, 2, order.getId(), order.getStatus());
}else{
//开始推单
-// pushOrder(order);
+ pushOrder(order);
}
return ResultUtil.success();
}
@@ -393,7 +393,7 @@
//1
//找到中心点
- GeoJsonPoint geoJsonPoint = new GeoJsonPoint(Double.valueOf(startLat), Double.valueOf(startLng));
+ GeoJsonPoint geoJsonPoint = new GeoJsonPoint(Double.valueOf(startLng), Double.valueOf(startLat));
Double num = num3 / 1000;//范围公里
//构造半径
Distance distanceR = new Distance(num, Metrics.KILOMETERS);
@@ -404,8 +404,10 @@
List<Location> locations = mongoTemplate.find(query, Location.class);
List<Integer> driverIds = locations.stream().map(Location::getDriverId).collect(Collectors.toList());
Integer driver = null;
+ YouTuiDriver youTuiDriver1 = null;
if(driverIds.size() > 0){
- List<YouTuiDriver> youTuiDrivers = youTuiDriverService.selectList(new EntityWrapper<YouTuiDriver>().in("driverId", driverIds).last(" and now() < failureTime"));
+ List<YouTuiDriver> youTuiDrivers = youTuiDriverService.selectList(new EntityWrapper<YouTuiDriver>().in("driverId", driverIds)
+ .eq("state", 2).last(" and (surplusQuantity > 0 or now() < endTime) and now() < failureTime"));
Double d = null;
for (YouTuiDriver youTuiDriver : youTuiDrivers) {
String value = redisUtil.getValue("DRIVER" + youTuiDriver.getDriverId());
@@ -417,10 +419,15 @@
if(d == null || d.compareTo(wgs84) > 0){
d = wgs84;
driver = youTuiDriver.getDriverId();
+ youTuiDriver1 = youTuiDriver;
}
}
}
+ if(null != youTuiDriver1 && youTuiDriver1.getType() == 1){
+ youTuiDriver1.setSurplusQuantity(youTuiDriver1.getSurplusQuantity() - 1);
+ youTuiDriverService.updateById(youTuiDriver1);
+ }
//开始范围查找
if(null == driver){
@@ -674,10 +681,15 @@
@Override
public OrderInfoWarpper queryOrderInfo(Integer uid, Long orderId) throws Exception {
OrderInfoWarpper orderInfoWarpper = this.baseMapper.queryOrderInfo(orderId);
+ AppUser appUser = appUserService.selectById(uid);
+ orderInfoWarpper.setBalance(appUser.getAccountBalance());
+ orderInfoWarpper.setCurrentDistance(0D);
String value = redisUtil.getValue("DRIVER" + uid);
- Map<String, Double> distance = GeodesyUtil.getDistance(orderInfoWarpper.getStartLng() + "," + orderInfoWarpper.getStartLat(), value);
- Double wgs84 = distance.get("WGS84");
- orderInfoWarpper.setCurrentDistance(wgs84);
+ if(ToolUtil.isNotEmpty(value)){
+ Map<String, Double> distance = GeodesyUtil.getDistance(orderInfoWarpper.getStartLng() + "," + orderInfoWarpper.getStartLat(), value);
+ Double wgs84 = distance.get("WGS84");
+ orderInfoWarpper.setCurrentDistance(wgs84);
+ }
return orderInfoWarpper;
}
@@ -1062,4 +1074,34 @@
public void saveRevenue(Order order){
}
+
+ /**
+ * 获取司机的订单列表
+ * @param driverId
+ * @param state
+ * @param pageNum
+ * @param pageSize
+ * @return
+ * @throws Exception
+ */
+ @Override
+ public List<DriverOrderListWarpper> queryDriverOrderList(Integer driverId, Integer state, Integer pageNum, Integer pageSize) throws Exception {
+ pageNum = (pageNum - 1) * pageSize;
+ return this.baseMapper.queryDriverOrderList(driverId, state, pageNum, pageSize);
+ }
+
+ /**
+ * 司机邀请列表
+ * @param driverId
+ * @param time
+ * @param pageNum
+ * @param pageSize
+ * @return
+ * @throws Exception
+ */
+ @Override
+ public List<InviteListWarpper> queryInviteList(Integer driverId, String time, Integer pageNum, Integer pageSize) throws Exception {
+ pageNum = (pageNum - 1) * pageSize;
+ return this.baseMapper.queryInviteList(driverId, time, pageNum, pageSize);
+ }
}
--
Gitblit v1.7.1