From 79d97c39f1d118824f91467feb9f4a55717fd0c0 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期五, 26 七月 2024 14:03:41 +0800
Subject: [PATCH] Merge branch '2.0' of http://120.76.84.145:10101/gitblit/r/java/IgoTravel into 2.0
---
DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/OrderServiceImpl.java | 28 ++++++++++++++++++++--------
1 files changed, 20 insertions(+), 8 deletions(-)
diff --git a/DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/OrderServiceImpl.java b/DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/OrderServiceImpl.java
index d63347f..838c5be 100644
--- a/DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/OrderServiceImpl.java
+++ b/DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/OrderServiceImpl.java
@@ -133,7 +133,7 @@
// List<Map<String, Object>> list2 = orderCrossCityService.queryOrderList(state, uid);
// datas.addAll(list2);
//小件物流
- List<Map<String, Object>> list3 = orderLogisticsService.queryOrderList(uid, language);
+ List<Map<String, Object>> list3 = orderLogisticsService.queryOrderList(state, uid, language);
datas.addAll(list3);
//分页
@@ -173,7 +173,7 @@
List<Map<String, Object>> list2 = orderCrossCityService.queryOrderList(language, state, uid);
datas.addAll(list2);
}else{//小件物流
- List<Map<String, Object>> list3 = orderLogisticsService.queryOrderList(uid, language);
+ List<Map<String, Object>> list3 = orderLogisticsService.queryOrderList(state, uid, language);
datas.addAll(list3);
}
@@ -211,11 +211,11 @@
List<Map<String, Object>> list1 = orderPrivateCarService.queryMyAllOrder(state, uid, language);
for (Map<String, Object> map : list1) {
Integer id = Integer.valueOf(map.get("id").toString());
- map.put("settleAccounts", 1);
+ map.put("settleAccounts", 0);
SettlementDetail settlementDetail = settlementDetailService.selectOne(new EntityWrapper<SettlementDetail>().eq("orderId", id).eq("orderType", 1));
if(null != settlementDetail){
SettlementRecord settlementRecord = settlementRecordService.selectById(settlementDetail.getSettlementRecordId());
- map.put("settleAccounts", settlementRecord.getPaymentStatus() == 1 ? 0 : 1);
+ map.put("settleAccounts", null == settlementRecord || settlementRecord.getPaymentStatus() == 1 ? 0 : 1);
}
}
datas.addAll(list1);
@@ -226,11 +226,11 @@
List<Map<String, Object>> list3 = orderLogisticsService.queryMyAllOrder(state, uid, language);
for (Map<String, Object> map : list3) {
Integer id = Integer.valueOf(map.get("id").toString());
- map.put("settleAccounts", 1);
+ map.put("settleAccounts", 0);
SettlementDetail settlementDetail = settlementDetailService.selectOne(new EntityWrapper<SettlementDetail>().eq("orderId", id).eq("orderType", 4));
if(null != settlementDetail){
SettlementRecord settlementRecord = settlementRecordService.selectById(settlementDetail.getSettlementRecordId());
- map.put("settleAccounts", settlementRecord.getPaymentStatus() == 1 ? 0 : 1);
+ map.put("settleAccounts", null == settlementRecord || settlementRecord.getPaymentStatus() == 1 ? 0 : 1);
}
}
datas.addAll(list3);
@@ -527,7 +527,19 @@
}
CancleOrder cancleOrder = cancleOrderService.selectOne(new EntityWrapper<CancleOrder>().eq("companyId", companyId));
JSONObject jsonObject = JSON.parseObject(cancleOrder.getContent());
- map.put("timeOutCancel", jsonObject.getIntValue("driverTimeout"));
+ int driverTimeout = jsonObject.getIntValue("driverTimeout");
+
+ SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+ Integer type = Integer.valueOf(map.get("orderType").toString());
+ if(type == 2){
+ String travelTime = map.get("travelTime").toString();
+ long time = System.currentTimeMillis() - sdf.parse(travelTime).getTime() - (driverTimeout * 60000);
+ map.put("timeOutCancel", Double.valueOf(time / 60000).intValue());
+ }else{
+ String estimateArriveTime = map.get("estimateArriveTime").toString();
+ long time = System.currentTimeMillis() - sdf.parse(estimateArriveTime).getTime() - (driverTimeout * 60000);
+ map.put("timeOutCancel", Double.valueOf(time / 60000).intValue());
+ }
return map;
}
@@ -735,7 +747,7 @@
case 3://城际
return orderCrossCityService.calculateMileage(orderPosition);
case 4://
- break;
+ return orderLogisticsService.calculateMileage(orderPosition.getOrderId(), orderPosition.getLon(), orderPosition.getLat());
case 5:
break;
case 6:
--
Gitblit v1.7.1