From be8545029b0dfc76a7b74c57098d74672bbdaf95 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期一, 04 十二月 2023 14:15:46 +0800
Subject: [PATCH] 更新
---
UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/smallLogistics/server/impl/OrderLogisticsServiceImpl.java | 30 ++++--
UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/OrderEvaluateServiceImpl.java | 6
UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/UserActivityBalanceServiceImpl.java | 12 +
UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/taxi/service/impl/OrderTaxiServiceImpl.java | 48 ++++++---
UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/CharteredCar/server/impl/OrderCharteredCarServiceImpl.java | 12 +
UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/UserCouponRecordServiceImpl.java | 12 +
UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/crossCity/server/impl/OrderCrossCityServiceImpl.java | 54 +++++++---
UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/specialTrain/server/impl/OrderPrivateCarServiceImpl.java | 36 ++++--
UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/OrderCancelServiceImpl.java | 6
UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/SystemNoticeServiceImpl.java | 6
UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/UserActivityRegisteredServiceImpl.java | 12 +
UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/UserInfoServiceImpl.java | 28 ++++-
12 files changed, 176 insertions(+), 86 deletions(-)
diff --git a/UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/CharteredCar/server/impl/OrderCharteredCarServiceImpl.java b/UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/CharteredCar/server/impl/OrderCharteredCarServiceImpl.java
index aa57443..1f7eebf 100644
--- a/UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/CharteredCar/server/impl/OrderCharteredCarServiceImpl.java
+++ b/UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/CharteredCar/server/impl/OrderCharteredCarServiceImpl.java
@@ -97,10 +97,14 @@
pageNum = (pageNum - 1) * size;
List<Map<String, Object>> maps = orderCharteredCarMapper.queryMyOrderList(uid, pageNum, size);
for (Map<String, Object> map : maps) {
- String orderTime = map.get("orderTime").toString();
- map.put("orderTime", DateUtil.conversionFormat(language, orderTime));
- String time = map.get("time").toString();
- map.put("time", DateUtil.conversionFormat(language, time));
+ if(null != map.get("orderTime")){
+ String orderTime = map.get("orderTime").toString();
+ map.put("orderTime", DateUtil.conversionFormat(language, orderTime));
+ }
+ if(null != map.get("time")){
+ String time = map.get("time").toString();
+ map.put("time", DateUtil.conversionFormat(language, time));
+ }
}
return maps;
}
diff --git a/UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/crossCity/server/impl/OrderCrossCityServiceImpl.java b/UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/crossCity/server/impl/OrderCrossCityServiceImpl.java
index be1b4d0..e399c8d 100644
--- a/UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/crossCity/server/impl/OrderCrossCityServiceImpl.java
+++ b/UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/crossCity/server/impl/OrderCrossCityServiceImpl.java
@@ -697,14 +697,22 @@
@Override
public Map<String, Object> queryOrderInfo(Integer language, Integer orderId) throws Exception {
Map<String, Object> map = orderCrossCityMapper.queryOrderInfo(orderId);
- String insertTime = map.get("insertTime").toString();
- map.put("insertTime", DateUtil.conversionFormat(language, insertTime));
- 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));
- String travelTime1 = map.get("travelTime1").toString();
- map.put("travelTime1", DateUtil.conversionFormat(language, travelTime1));
+ if(null != map.get("insertTime")){
+ String insertTime = map.get("insertTime").toString();
+ map.put("insertTime", DateUtil.conversionFormat(language, insertTime));
+ }
+ 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));
+ }
+ if(null != map.get("travelTime1")){
+ String travelTime1 = map.get("travelTime1").toString();
+ map.put("travelTime1", DateUtil.conversionFormat(language, travelTime1));
+ }
if(null != map.get("reassignNotice") && Integer.valueOf(String.valueOf(map.get("reassignNotice"))) == 2){//改派完成，重新获取了新的司机数据，开始修改数据防止继续调用
OrderCrossCity orderCrossCity = this.selectById(orderId);
orderCrossCity.setReassignNotice(0);
@@ -1123,10 +1131,14 @@
if(Integer.valueOf(String.valueOf(map.get("state"))) == 11){
map.put("state", map.get("oldState"));
}
- String orderTime = map.get("orderTime").toString();
- map.put("orderTime", DateUtil.conversionFormat(language, orderTime));
- String time = map.get("time").toString();
- map.put("time", DateUtil.conversionFormat1(language, time));
+ if(null != map.get("orderTime")){
+ String orderTime = map.get("orderTime").toString();
+ map.put("orderTime", DateUtil.conversionFormat(language, orderTime));
+ }
+ if(null != map.get("time")){
+ String time = map.get("time").toString();
+ map.put("time", DateUtil.conversionFormat1(language, time));
+ }
}
return maps;
}
@@ -1135,8 +1147,10 @@
public List<Map<String, Object>> queryMyTravelRecord(Integer language, Integer uid) {
List<Map<String, Object>> list = orderCrossCityMapper.queryMyTravelRecord(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;
}
@@ -1147,8 +1161,10 @@
endTime = dateUtil.getStartOrEndDate(endTime, "end");
List<Map<String, Object>> list = orderCrossCityMapper.queryInvoiceOrder(type, startTime, endTime, startMoney, endMoney, 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;
}
@@ -1164,8 +1180,10 @@
public List<Map<String, Object>> queryRedEnvelope(Integer language, Integer uid) throws Exception {
List<Map<String, Object>> list = orderCrossCityMapper.queryRedEnvelope(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;
}
diff --git a/UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/smallLogistics/server/impl/OrderLogisticsServiceImpl.java b/UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/smallLogistics/server/impl/OrderLogisticsServiceImpl.java
index 1a174c7..e3fce28 100644
--- a/UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/smallLogistics/server/impl/OrderLogisticsServiceImpl.java
+++ b/UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/smallLogistics/server/impl/OrderLogisticsServiceImpl.java
@@ -1266,10 +1266,14 @@
pageNum = (pageNum - 1) * size;
List<Map<String, Object>> maps = orderLogisticsMapper.queryMyOrderList(uid, pageNum, size, language);
for (Map<String, Object> map : maps) {
- String orderTime = map.get("orderTime").toString();
- map.put("orderTime", DateUtil.conversionFormat(language, orderTime));
- String time = map.get("time").toString();
- map.put("time", DateUtil.conversionFormat(language, time));
+ if(null != map.get("orderTime")){
+ String orderTime = map.get("orderTime").toString();
+ map.put("orderTime", DateUtil.conversionFormat(language, orderTime));
+ }
+ if(null != map.get("time")){
+ String time = map.get("time").toString();
+ map.put("time", DateUtil.conversionFormat(language, time));
+ }
Integer orderId = Integer.valueOf(String.valueOf(map.get("orderId")));
Integer state = Integer.valueOf(String.valueOf(map.get("state")));
if(state == 6){
@@ -1291,8 +1295,10 @@
public List<Map<String, Object>> queryMyTravelRecord(Integer language, Integer uid) {
List<Map<String, Object>> list = orderLogisticsMapper.queryMyTravelRecord(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;
}
@@ -1304,8 +1310,10 @@
endTime = dateUtil.getStartOrEndDate(endTime, "end");
List<Map<String, Object>> list = orderLogisticsMapper.queryInvoiceOrder(type, startTime, endTime, startMoney, endMoney, uid, orderType);
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;
}
@@ -1502,8 +1510,10 @@
@Override
public Map<String, Object> queryOrderInfo(Integer language, Integer orderId) throws Exception {
Map<String, Object> map = orderLogisticsMapper.queryOrderInfo(orderId);
- 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.conversionFormat1(language, travelTime));
+ }
Integer state = Integer.valueOf(String.valueOf(map.get("state")));
OrderLogistics orderLogistics = this.selectById(orderId);
if(null != map.get("reassignNotice") && Integer.valueOf(String.valueOf(map.get("reassignNotice"))) == 2){//改派完成，重新获取了新的司机数据，开始修改数据防止继续调用
diff --git a/UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/specialTrain/server/impl/OrderPrivateCarServiceImpl.java b/UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/specialTrain/server/impl/OrderPrivateCarServiceImpl.java
index ef2b83c..fe091ee 100644
--- a/UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/specialTrain/server/impl/OrderPrivateCarServiceImpl.java
+++ b/UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/specialTrain/server/impl/OrderPrivateCarServiceImpl.java
@@ -2058,10 +2058,14 @@
pageNum = (pageNum - 1) * size;
List<Map<String, Object>> maps = orderPrivateCarMapper.queryMyOrderList(uid, pageNum, size);
for(Map<String, Object> map : maps){
- String orderTime = map.get("orderTime").toString();
- map.put("orderTime", DateUtil.conversionFormat(language, orderTime));
- String time = map.get("time").toString();
- map.put("time", DateUtil.conversionFormat1(language, time));
+ if(null != map.get("orderTime")){
+ String orderTime = map.get("orderTime").toString();
+ map.put("orderTime", DateUtil.conversionFormat(language, orderTime));
+ }
+ if(null != map.get("time")){
+ String time = map.get("time").toString();
+ map.put("time", DateUtil.conversionFormat1(language, time));
+ }
Integer orderId = Integer.valueOf(String.valueOf(map.get("orderId")));
Integer state = Integer.valueOf(String.valueOf(map.get("state")));
if(state == 11){
@@ -2082,8 +2086,10 @@
endTime = dateUtil.getStartOrEndDate(endTime, "end");
List<Map<String, Object>> list = orderPrivateCarMapper.queryInvoiceOrder(type, startTime, endTime, startMoney, endMoney, 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;
}
@@ -2091,8 +2097,10 @@
@Override
public Map<String, Object> queryOrderInfo(Integer language, Integer orderId) throws Exception {
Map<String, Object> map = orderPrivateCarMapper.queryOrderInfo(orderId);
- 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.conversionFormat1(language, travelTime));
+ }
Integer state = Integer.valueOf(String.valueOf(map.get("state")));
if(null != map.get("reassignNotice") && Integer.valueOf(String.valueOf(map.get("reassignNotice"))) == 2){//改派完成，重新获取了新的司机数据，开始修改数据防止继续调用
OrderPrivateCar orderPrivateCar = this.selectById(orderId);
@@ -2139,8 +2147,10 @@
public List<Map<String, Object>> queryMyTravelRecord(Integer language, Integer uid) throws Exception {
List<Map<String, Object>> list = orderPrivateCarMapper.queryMyTravelRecord(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;
}
@@ -2258,8 +2268,10 @@
public List<Map<String, Object>> queryRedEnvelope(Integer language, Integer uid) throws Exception {
List<Map<String, Object>> list = orderPrivateCarMapper.queryRedEnvelope(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;
}
diff --git a/UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/OrderCancelServiceImpl.java b/UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/OrderCancelServiceImpl.java
index a944820..17ef305 100644
--- a/UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/OrderCancelServiceImpl.java
+++ b/UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/OrderCancelServiceImpl.java
@@ -82,8 +82,10 @@
public List<Map<String, Object>> queryCancel(Integer language, Integer uid, Integer isPay) throws Exception {
List<Map<String, Object>> list = orderCancelMapper.queryCancel(uid, isPay);
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;
}
diff --git a/UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/OrderEvaluateServiceImpl.java b/UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/OrderEvaluateServiceImpl.java
index d02c843..41a6dbd 100644
--- a/UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/OrderEvaluateServiceImpl.java
+++ b/UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/OrderEvaluateServiceImpl.java
@@ -115,8 +115,10 @@
pageNum = (pageNum - 1) * size;
List<Map<String, Object>> list = orderEvaluateMapper.queryOrderEvaluate(driverId, pageNum, size);
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;
}
diff --git a/UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/SystemNoticeServiceImpl.java b/UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/SystemNoticeServiceImpl.java
index f354093..273fab8 100644
--- a/UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/SystemNoticeServiceImpl.java
+++ b/UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/SystemNoticeServiceImpl.java
@@ -78,8 +78,10 @@
}
}
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;
diff --git a/UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/UserActivityBalanceServiceImpl.java b/UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/UserActivityBalanceServiceImpl.java
index e3b2460..b6df19e 100644
--- a/UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/UserActivityBalanceServiceImpl.java
+++ b/UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/UserActivityBalanceServiceImpl.java
@@ -32,10 +32,14 @@
public List<Map<String, Object>> query(Integer language, Double money, Integer companyId) throws Exception {
List<Map<String, Object>> query = userActivityBalanceMapper.query(money, companyId);
for (Map<String, Object> map : query) {
- String startTime = map.get("startTime").toString();
- map.put("startTime", DateUtil.conversionFormat(language, startTime));
- String endTime = map.get("endTime").toString();
- map.put("endTime", DateUtil.conversionFormat(language, endTime));
+ if(null != map.get("startTime")){
+ String startTime = map.get("startTime").toString();
+ map.put("startTime", DateUtil.conversionFormat(language, startTime));
+ }
+ if(null != map.get("endTime")){
+ String endTime = map.get("endTime").toString();
+ map.put("endTime", DateUtil.conversionFormat(language, endTime));
+ }
}
return query;
}
diff --git a/UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/UserActivityRegisteredServiceImpl.java b/UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/UserActivityRegisteredServiceImpl.java
index cddcff5..448a51d 100644
--- a/UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/UserActivityRegisteredServiceImpl.java
+++ b/UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/UserActivityRegisteredServiceImpl.java
@@ -33,10 +33,14 @@
public List<Map<String, Object>> query(Integer language, Integer companyId) throws Exception {
List<Map<String, Object>> query = userActivityRegisteredMapper.query(companyId);
for (Map<String, Object> map : query) {
- String startTime = map.get("startTime").toString();
- map.put("startTime", DateUtil.conversionFormat(language, startTime));
- String endTime = map.get("endTime").toString();
- map.put("endTime", DateUtil.conversionFormat(language, endTime));
+ if(null != map.get("startTime")){
+ String startTime = map.get("startTime").toString();
+ map.put("startTime", DateUtil.conversionFormat(language, startTime));
+ }
+ if(null != map.get("endTime")){
+ String endTime = map.get("endTime").toString();
+ map.put("endTime", DateUtil.conversionFormat(language, endTime));
+ }
}
return query;
}
diff --git a/UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/UserCouponRecordServiceImpl.java b/UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/UserCouponRecordServiceImpl.java
index 3b03106..f07c287 100644
--- a/UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/UserCouponRecordServiceImpl.java
+++ b/UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/UserCouponRecordServiceImpl.java
@@ -51,8 +51,10 @@
pageNum = (pageNum - 1) * size;
List<Map<String, Object>> list = userCouponRecordMapper.queryCoupon(uid, companyId, state, couponUseType, money, pageNum, size);
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;
}
@@ -72,8 +74,10 @@
pageNum = (pageNum - 1) * size;
List<Map<String, Object>> list = userCouponRecordMapper.queryMyCoupons(state, pageNum, size, 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;
}
diff --git a/UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/UserInfoServiceImpl.java b/UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/UserInfoServiceImpl.java
index 9e2f499..dc8f36b 100644
--- a/UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/UserInfoServiceImpl.java
+++ b/UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/UserInfoServiceImpl.java
@@ -422,10 +422,18 @@
Date date = new Date();
for(Map<String, Object> map : query){
Double lavePrice = Double.valueOf(map.get("lavePrice").toString());
- String startTime = map.get("startTime").toString();
- String endTime = map.get("endTime").toString();
- map.put("startTime", DateUtil.conversionFormat(language, startTime));
- map.put("endTime", DateUtil.conversionFormat(language, endTime));
+ String startTime = "";
+ String endTime = "";
+ if(null != map.get("startTime")){
+ startTime = map.get("startTime").toString();
+ map.put("startTime", DateUtil.conversionFormat(language, startTime));
+ startTime = DateUtil.conversionFormat(language, startTime);
+ }
+ if(null != map.get("endTime")){
+ endTime = map.get("endTime").toString();
+ map.put("endTime", DateUtil.conversionFormat(language, endTime));
+ endTime = DateUtil.conversionFormat(language, endTime);
+ }
int num = 0;
for(int i = Integer.valueOf(String.valueOf(map.get("totalNum"))); i > 0; i--){
//判断当前优惠券金额是否大于可发放剩余总金额
@@ -1393,8 +1401,10 @@
@Override
public Map<String, Object> queryUserInfo(Integer language, Integer uid) throws Exception {
Map<String, Object> map = userInfoMapper.queryUserInfo(uid, null);
- String birthday = map.get("birthday").toString();
- map.put("birthday", DateUtil.conversionFormat(language, birthday));
+ if(null != map.get("birthday")){
+ String birthday = map.get("birthday").toString();
+ map.put("birthday", DateUtil.conversionFormat(language, birthday));
+ }
return map;
}
@@ -1408,8 +1418,10 @@
@Override
public Map<String, Object> queryUser(Integer language, String phone) throws Exception {
Map<String, Object> map = userInfoMapper.queryUserInfo(null, phone);
- String birthday = map.get("birthday").toString();
- map.put("birthday", DateUtil.conversionFormat(language, birthday));
+ if(null != map.get("birthday")){
+ String birthday = map.get("birthday").toString();
+ map.put("birthday", DateUtil.conversionFormat(language, birthday));
+ }
return map;
}
diff --git a/UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/taxi/service/impl/OrderTaxiServiceImpl.java b/UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/taxi/service/impl/OrderTaxiServiceImpl.java
index bfd78ab..b32e85f 100644
--- a/UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/taxi/service/impl/OrderTaxiServiceImpl.java
+++ b/UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/taxi/service/impl/OrderTaxiServiceImpl.java
@@ -825,10 +825,14 @@
if(Integer.valueOf(String.valueOf(map.get("state"))) == 11){
map.put("state", map.get("oldState"));
}
- String orderTime = map.get("orderTime").toString();
- String time = map.get("time").toString();
- map.put("orderTime", DateUtil.conversionFormat(language, orderTime));
- map.put("time", DateUtil.conversionFormat1(language, time));
+ if(null != map.get("orderTime")){
+ String orderTime = map.get("orderTime").toString();
+ map.put("orderTime", DateUtil.conversionFormat(language, orderTime));
+ }
+ if(null != map.get("time")){
+ String time = map.get("time").toString();
+ map.put("time", DateUtil.conversionFormat1(language, time));
+ }
}
return maps;
}
@@ -844,8 +848,10 @@
public List<Map<String, Object>> queryMyTravelRecord(Integer language, Integer uid) throws Exception {
List<Map<String, Object>> list = orderTaxiMapper.queryMyTravelRecord(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;
}
@@ -861,8 +867,10 @@
public List<Map<String, Object>> queryRedEnvelope(Integer language, Integer uid) throws Exception {
List<Map<String, Object>> list = orderTaxiMapper.queryRedEnvelope(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;
}
@@ -886,8 +894,10 @@
endTime = dateUtil.getStartOrEndDate(endTime, "end");
List<Map<String, Object>> list = orderTaxiMapper.queryInvoiceOrder(type, startTime, endTime, startMoney, endMoney, 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;
}
@@ -913,12 +923,18 @@
map.put("device", ToolUtil.isNotEmpty(driverId) ? 2 : 1);
map.put("orderType", 2);
- String insertTime = map.get("insertTime").toString();
- map.put("insertTime", DateUtil.conversionFormat(language, insertTime));
- 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("insertTime")){
+ String insertTime = map.get("insertTime").toString();
+ map.put("insertTime", DateUtil.conversionFormat(language, insertTime));
+ }
+ 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