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/system/service/impl/DriverServiceImpl.java | 30 ++++++++++++++++++++----------
1 files changed, 20 insertions(+), 10 deletions(-)
diff --git a/DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/DriverServiceImpl.java b/DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/DriverServiceImpl.java
index f677fb2..7fd5109 100644
--- a/DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/DriverServiceImpl.java
+++ b/DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/DriverServiceImpl.java
@@ -1174,12 +1174,18 @@
@Override
public Map<String, Object> queryInfo(Integer language, Integer uid) throws Exception {
Map<String, Object> map = driverMapper.queryInfo(uid);
- String birthday = map.get("birthday").toString();
- map.put("birthday", DateUtil.conversionFormat(language, birthday));
- String networkCarlssueDate = map.get("networkCarlssueDate").toString();
- map.put("networkCarlssueDate", DateUtil.conversionFormat(language, networkCarlssueDate));
- String getDriverLicenseDate = map.get("getDriverLicenseDate").toString();
- map.put("getDriverLicenseDate", DateUtil.conversionFormat(language, getDriverLicenseDate));
+ if(null != map.get("birthday")){
+ String birthday = map.get("birthday").toString();
+ map.put("birthday", DateUtil.conversionFormat(language, birthday));
+ }
+ if(null != map.get("networkCarlssueDate")){
+ String networkCarlssueDate = map.get("networkCarlssueDate").toString();
+ map.put("networkCarlssueDate", DateUtil.conversionFormat(language, networkCarlssueDate));
+ }
+ if(null != map.get("getDriverLicenseDate")){
+ String getDriverLicenseDate = map.get("getDriverLicenseDate").toString();
+ map.put("getDriverLicenseDate", DateUtil.conversionFormat(language, getDriverLicenseDate));
+ }
if(ToolUtil.isEmpty(map.get("qrCode"))){
//获取小程序二维码
Driver driver = new Driver();
@@ -2747,16 +2753,20 @@
//乘客表uType为2表示是司机邀请的
List<Map<String, Object>> list = userInfoMapper.queryMyInviteUserList(2, uid, pageNum, size);
for (Map<String, Object> map : list) {
- String insertTime = map.get("insertTime").toString();
- map.put("insertTime", DateUtil.conversionFormat(language, insertTime));
+ if(null != map.get("insertTime")){
+ String insertTime = map.get("insertTime").toString();
+ map.put("insertTime", DateUtil.conversionFormat(language, insertTime));
+ }
}
return list;
}else if(type==2){
//司机表uType为2表示是司机邀请的
List<Map<String, Object>> list = driverMapper.queryMyInviteDriverList(2, uid, pageNum, size);
for (Map<String, Object> map : list) {
- String insertTime = map.get("insertTime").toString();
- map.put("insertTime", DateUtil.conversionFormat(language, insertTime));
+ if(null != map.get("insertTime")){
+ String insertTime = map.get("insertTime").toString();
+ map.put("insertTime", DateUtil.conversionFormat(language, insertTime));
+ }
}
return list;
}
--
Gitblit v1.7.1