From 8f39e870ca9519d8a8190c038d15a030149de98e Mon Sep 17 00:00:00 2001
From: zhibing.pu <393733352@qq.com>
Date: 星期二, 27 八月 2024 09:13:33 +0800
Subject: [PATCH] 修改2.0 bug
---
UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/UserInfoServiceImpl.java | 22 ++++++++++++----------
1 files changed, 12 insertions(+), 10 deletions(-)
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 80bb72f..2c65f75 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
@@ -34,13 +34,11 @@
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Service;
+import org.springframework.web.bind.annotation.RequestBody;
import javax.annotation.Resource;
import javax.servlet.http.HttpServletRequest;
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileOutputStream;
-import java.io.FileWriter;
+import java.io.*;
import java.math.BigDecimal;
import java.text.SimpleDateFormat;
import java.util.*;
@@ -160,6 +158,11 @@
return ResultUtil.success();
}
+
+
+
+
+
/**
* 校验短信验证码
@@ -214,7 +217,7 @@
//用户所属企业
if(null != lat && null != lng){
- ReverseGeocodeVo reverseGeocode = GoogleMapUtil.getReverseGeocode(lat, lat);
+ ReverseGeocodeVo reverseGeocode = GoogleMapUtil.getReverseGeocode(lat, lat, null);
AddressComponentsVo[] addressComponentsVos = reverseGeocode.getAddressComponentsVos();
String[] citys = new String[addressComponentsVos.length];
for (int i = 0; i < addressComponentsVos.length; i++) {
@@ -1298,7 +1301,7 @@
}
//用户所属企业
if(null != lat && null != lng){
- ReverseGeocodeVo reverseGeocode = GoogleMapUtil.getReverseGeocode(lat, lng);
+ ReverseGeocodeVo reverseGeocode = GoogleMapUtil.getReverseGeocode(lat, lng, null);
if(null != reverseGeocode){
AddressComponentsVo[] addressComponentsVos = reverseGeocode.getAddressComponentsVos();
String[] citys = new String[addressComponentsVos.length];
@@ -1692,6 +1695,9 @@
@Override
public Map<String, Object> queryUser(Integer language, String phone) throws Exception {
Map<String, Object> map = userInfoMapper.queryUserInfo(null, phone);
+ if(null == map){
+ return null;
+ }
if(null != map.get("birthday")){
String birthday = map.get("birthday").toString();
map.put("birthday", DateUtil.conversionFormat(language, birthday));
@@ -1975,13 +1981,9 @@
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);
}
double fullMoney = 0;
if(null != map.get("bcompanyId")){
--
Gitblit v1.7.1