From b4eb20bf5bfff2a845cf24aa69839184191365c8 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期一, 04 十二月 2023 14:17:18 +0800
Subject: [PATCH] 更新接口
---
DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/crossCity/server/impl/OrderCrossCityServiceImpl.java | 42 ++++++++++++++++++++++++++++--------------
1 files changed, 28 insertions(+), 14 deletions(-)
diff --git a/DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/crossCity/server/impl/OrderCrossCityServiceImpl.java b/DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/crossCity/server/impl/OrderCrossCityServiceImpl.java
index e8a6a2e..686e915 100644
--- a/DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/crossCity/server/impl/OrderCrossCityServiceImpl.java
+++ b/DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/crossCity/server/impl/OrderCrossCityServiceImpl.java
@@ -155,8 +155,10 @@
public List<Map<String, Object>> queryOrderList(Integer language, Integer state, Integer driverId) throws Exception {
List<Map<String, Object>> list = orderCrossCityMapper.queryOrderList(state, driverId);
for (Map<String, Object> map : list) {
- String time = map.get("time").toString();
- map.put("time", DateUtil.conversionFormat(language, time));
+ if(null != map.get("time")){
+ String time = map.get("time").toString();
+ map.put("time", DateUtil.conversionFormat(language, time));
+ }
}
return list;
}
@@ -172,8 +174,10 @@
public List<Map<String, Object>> queryMyAllOrder(Integer language, Integer state, Integer uid) throws Exception {
List<Map<String, Object>> list = orderCrossCityMapper.queryMyAllOrder(state, uid);
for (Map<String, Object> map : list) {
- String time = map.get("time").toString();
- map.put("time", DateUtil.conversionFormat(language, time));
+ if(null != map.get("time")){
+ String time = map.get("time").toString();
+ map.put("time", DateUtil.conversionFormat(language, time));
+ }
}
return list;
}
@@ -194,12 +198,18 @@
Double serverMoney = 0D;
Double totalMoney = 0D;
for(Map<String, Object> m : order){
- String travelTime_ = map.get("travelTime_").toString();
- map.put("travelTime_", DateUtil.conversionFormat1(language, travelTime_));
- String travelTime = map.get("travelTime").toString();
- map.put("travelTime", DateUtil.conversionFormat(language, travelTime));
- String arriveTime = map.get("arriveTime").toString();
- map.put("arriveTime", DateUtil.conversionFormat(language, arriveTime));
+ if(null != map.get("travelTime_")){
+ String travelTime_ = map.get("travelTime_").toString();
+ map.put("travelTime_", DateUtil.conversionFormat1(language, travelTime_));
+ }
+ if(null != map.get("travelTime")){
+ String travelTime = map.get("travelTime").toString();
+ map.put("travelTime", DateUtil.conversionFormat(language, travelTime));
+ }
+ if(null != map.get("arriveTime")){
+ String arriveTime = map.get("arriveTime").toString();
+ map.put("arriveTime", DateUtil.conversionFormat(language, arriveTime));
+ }
num += Integer.valueOf(m.get("peopleNumber").toString());
totalMoney += Double.valueOf(m.get("payMoney").toString());
List<Income> incomes = incomeService.queryData(1, null, 2, Integer.valueOf(m.get("orderId").toString()), 3);
@@ -305,10 +315,14 @@
@Override
public Map<String, Object> queryOrderCrossCityInfo(Integer language, Integer orderId) throws Exception {
Map<String, Object> map = orderCrossCityMapper.queryOrderCrossCityInfo(orderId);
- String travelTime_ = map.get("travelTime_").toString();
- map.put("travelTime_", DateUtil.conversionFormat1(language, travelTime_));
- String arriveTime = map.get("arriveTime").toString();
- map.put("arriveTime", DateUtil.conversionFormat(language, arriveTime));
+ if(null != map.get("travelTime_")){
+ String travelTime_ = map.get("travelTime_").toString();
+ map.put("travelTime_", DateUtil.conversionFormat1(language, travelTime_));
+ }
+ if(null != map.get("arriveTime")){
+ String arriveTime = map.get("arriveTime").toString();
+ map.put("arriveTime", DateUtil.conversionFormat(language, arriveTime));
+ }
return map;
}
--
Gitblit v1.7.1