From 788e0aaa0896bb59ca4379e50bf72b4bd07211a6 Mon Sep 17 00:00:00 2001
From: 44323 <443237572@qq.com>
Date: 星期五, 17 五月 2024 17:54:54 +0800
Subject: [PATCH] 车型、司机活动、平台佣金统计代码提交
---
UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/OpenCityServiceImpl.java | 21 +++++++++++++--------
1 files changed, 13 insertions(+), 8 deletions(-)
diff --git a/UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/OpenCityServiceImpl.java b/UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/OpenCityServiceImpl.java
index 94f88dc..713ebab 100644
--- a/UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/OpenCityServiceImpl.java
+++ b/UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/OpenCityServiceImpl.java
@@ -41,12 +41,12 @@
*/
@Override
public List<BaseWarpper> queryOpenCity(Integer uid, Integer language) throws Exception {
- if(null == language){
- language = 2;
- }
- if(null != uid){
+ if(null == language && null != uid){
UserInfo userInfo = userInfoService.selectById(uid);
language = userInfo.getLanguage();
+ }
+ if(null == language){
+ language = 2;
}
List<OpenCity> openCities = openCityMapper.queryOpenCity();
List<BaseWarpper> list = new ArrayList<>();
@@ -57,6 +57,7 @@
baseWarpper.setName(language == 1 ? city.getChineseName() : language == 2 ? city.getEnglishName() : language == 3 ? city.getFrenchName() : city.getEnglishName());
baseWarpper.setLon(null != c.getLon() ? c.getLon() : 0);
baseWarpper.setLat(null != c.getLat() ? c.getLat() : 0);
+ baseWarpper.setContent(language == 1 ? city.getCountryChineseName() : language == 2 ? city.getCountryEnglishName() : language == 3 ? city.getCountryFrenchName() : city.getEnglishName());
list.add(baseWarpper);
}
return list;
@@ -69,10 +70,13 @@
* @throws Exception
*/
@Override
- public boolean openCity(Double lat, Double lnt) throws Exception {
+ public City openCity(Double lat, Double lnt, Integer language) throws Exception {
+ if(null == language){
+ language = 2;
+ }
ReverseGeocodeVo reverseGeocode = GoogleMapUtil.getReverseGeocode(lat, lnt);
if(null == reverseGeocode){
- return false;
+ return null;
}
AddressComponentsVo[] addressComponentsVos = reverseGeocode.getAddressComponentsVos();
String[] city = new String[addressComponentsVos.length];
@@ -81,8 +85,9 @@
}
List<OpenCity> openCities = openCityMapper.queryByCode(city);
if(openCities.size() == 0){
- return false;
+ return null;
}
- return true;
+ City city1 = cityService.selectById(openCities.get(0).getCityId());
+ return city1;
}
}
--
Gitblit v1.7.1