From 0d8b60c9ed72d996280688a82ffa8eac3afbbff9 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期五, 02 六月 2023 15:28:24 +0800
Subject: [PATCH] 新增加充值和提现功能
---
driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/service/impl/OrderPositionServiceImpl.java | 57 ++++++++++++++++++++++++++++++++++++++++++---------------
1 files changed, 42 insertions(+), 15 deletions(-)
diff --git a/driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/service/impl/OrderPositionServiceImpl.java b/driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/service/impl/OrderPositionServiceImpl.java
index 8184384..d3d7032 100644
--- a/driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/service/impl/OrderPositionServiceImpl.java
+++ b/driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/service/impl/OrderPositionServiceImpl.java
@@ -48,8 +48,12 @@
@Override
public void saveOrderPosition(DriverPositionWarpper driverPositionWarpper) throws Exception {
Integer orderId = driverPositionWarpper.getOrderId();
+ Order order = orderService.selectById(orderId);
+ if(order.getState() != 105){
+ return;
+ }
Integer orderType = driverPositionWarpper.getOrderType();
- File file = new File(filePath + orderId + "_" + orderType + ".json");
+ File file = new File(filePath + orderId + ".json");
if(!file.exists()){
file.getParentFile().mkdirs();
file.createNewFile();
@@ -59,14 +63,29 @@
OrderPositionWarpper orderPositionWarpper = orderPositionWarppers.get(orderPositionWarppers.size() - 1);
saveOrderMileage(driverPositionWarpper, orderPositionWarpper);
}
- OrderPositionWarpper orderPositionWarpper = new OrderPositionWarpper();
- BeanUtils.copyProperties(driverPositionWarpper, orderPositionWarpper);
- orderPositionWarpper.setInsertTime(new Date());
- orderPositionWarppers.add(orderPositionWarpper);
+ //大于100米才存储有效定位数据
+ if(orderPositionWarppers.size() > 0){
+ OrderPositionWarpper orderPositionWarpper1 = orderPositionWarppers.get(orderPositionWarppers.size() - 1);
+ String fromLonLat = driverPositionWarpper.getLon() + "," + driverPositionWarpper.getLat();
+ String toLonLat = orderPositionWarpper1.getLon() + "," + orderPositionWarpper1.getLat();
+ Map<String, Double> distance = GeodesyUtil.getDistance(fromLonLat, toLonLat);
+ Double wgs84 = distance.get("WGS84");
+ if(wgs84 >= 100){
+ OrderPositionWarpper orderPositionWarpper = new OrderPositionWarpper();
+ BeanUtils.copyProperties(driverPositionWarpper, orderPositionWarpper);
+ orderPositionWarpper.setInsertTime(new Date());
+ orderPositionWarppers.add(orderPositionWarpper);
+ }
+ }else{
+ OrderPositionWarpper orderPositionWarpper = new OrderPositionWarpper();
+ BeanUtils.copyProperties(driverPositionWarpper, orderPositionWarpper);
+ orderPositionWarpper.setInsertTime(new Date());
+ orderPositionWarppers.add(orderPositionWarpper);
+ }
//写入相应的文件
PrintWriter out = new PrintWriter(new FileWriter(file));
- out.write(JSON.toJSONString(driverPositionWarpper));
+ out.write(JSON.toJSONString(orderPositionWarppers));
out.flush();
out.close();
}
@@ -84,8 +103,9 @@
Order order = orderService.selectById(driverPositionWarpper.getOrderId());
Double wgs84 = distance.get("WGS84");
Integer num = map.get(order.getId().toString());
- if(50 < wgs84){
+ if(100 < wgs84){
order.setActualMileage(order.getActualMileage() + wgs84.intValue());
+ orderService.updateById(order);
map.put(order.getId().toString(), 0);
if(order.getState() == 401){//定位变动，自动开始服务
@@ -98,17 +118,23 @@
e.printStackTrace();
}
}
-
}
- if(50 >= wgs84 && 12 <= (null == num ? 0 : num)){//1分钟（5秒上传一次数据）
+ if(100 >= wgs84 && 12 <= (null == num ? 0 : num)){//1分钟（5秒上传一次数据）
Integer integer = map.get(order.getId().toString());
- map.put(order.getId().toString(), integer++);
- order.setState(401);//进入等待状态
- order.setStartWaitTime(new Date());
+ map.put(order.getId().toString(), null == integer ? 0 : integer++);
+ //进入等待状态
+ ProcessOperationsWarpper processOperationsWarpper = new ProcessOperationsWarpper();
+ processOperationsWarpper.setOrderId(order.getId());
+ processOperationsWarpper.setState(401);
+ try {
+ orderService.driverProcessOperations(order.getDriverId(), processOperationsWarpper);
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
}
- if(50 >= wgs84 && 12 > (null == num ? 0 : num)){
+ if(100 >= wgs84 && 12 > (null == num ? 0 : num)){
Integer integer = map.get(order.getId().toString());
- map.put(order.getId().toString(), integer++);
+ map.put(order.getId().toString(), null == integer ? 0 : integer++);
}
}
@@ -125,8 +151,9 @@
@Override
public List<OrderPositionWarpper> queryPosition(Integer orderId, Integer orderType) throws Exception {
//将数据存储到文件中
- File file = new File(filePath + orderId + "_" + orderType + ".txt");
+ File file = new File(filePath + orderId + ".json");
if(!file.exists()){
+ System.err.println("不存在");
return new ArrayList<>();
}
//读取文件(字符流)
--
Gitblit v1.7.1