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/OpenCityBusinessServiceImpl.java | 17 +++++++++++------
1 files changed, 11 insertions(+), 6 deletions(-)
diff --git a/UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/OpenCityBusinessServiceImpl.java b/UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/OpenCityBusinessServiceImpl.java
index bfa631c..4d02159 100644
--- a/UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/OpenCityBusinessServiceImpl.java
+++ b/UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/OpenCityBusinessServiceImpl.java
@@ -7,6 +7,7 @@
import com.stylefeng.guns.modular.system.util.GoogleMap.AddressComponentsVo;
import com.stylefeng.guns.modular.system.util.GoogleMap.GoogleMapUtil;
import com.stylefeng.guns.modular.system.util.GoogleMap.ReverseGeocodeVo;
+import com.stylefeng.guns.modular.system.util.RedisUtil;
import com.stylefeng.guns.modular.system.warpper.BaseWarpper;
import org.springframework.stereotype.Service;
@@ -20,6 +21,9 @@
@Resource
private OpenCityBusinessMapper openCityBusinessMapper;
+
+ @Resource
+ private RedisUtil redisUtil;
/**
@@ -28,11 +32,12 @@
* @throws Exception
*/
@Override
- public List<BaseWarpper> queryBusiness(Double lat, Double lnt, Integer language) throws Exception {
+ public List<BaseWarpper> queryBusiness(Integer uid, Double lat, Double lnt, Integer language) throws Exception {
if(null == language){
language = 2;
}
- ReverseGeocodeVo reverseGeocode = GoogleMapUtil.getReverseGeocode(lat, lnt);
+ String tripId = redisUtil.getValue("trip" + uid);
+ ReverseGeocodeVo reverseGeocode = GoogleMapUtil.getReverseGeocode(lat, lnt, tripId);
if(null == reverseGeocode){
return new ArrayList<>();
}
@@ -47,7 +52,7 @@
BaseWarpper baseWarpper = new BaseWarpper();
switch (b.getBusinessType()){
case 1:
- baseWarpper.setName(language == 1 ? "专车" : language == 2 ? "special car" : "voiture spéciale");
+ baseWarpper.setName(language == 1 ? "打车" : language == 2 ? "Ride" : "Course");
baseWarpper.setId(1);
break;
// case 2:
@@ -59,7 +64,7 @@
// baseWarpper.setId(3);
// break;
case 4:
- baseWarpper.setName(language == 1 ? "市内小件物流" : language == 2 ? "Small logistics in the city" : "Petite logistique en ville");
+ baseWarpper.setName(language == 1 ? "包裹" : language == 2 ? "Delivery" : "Livraison");
baseWarpper.setId(4);
break;
// case 5:
@@ -94,7 +99,7 @@
BaseWarpper baseWarpper = new BaseWarpper();
switch (b.getBusinessType()){
case 1:
- baseWarpper.setName(language == 1 ? "专车" : language == 2 ? "special car" : "voiture spéciale");
+ baseWarpper.setName(language == 1 ? "打车" : language == 2 ? "Ride" : "Course");
baseWarpper.setId(1);
break;
// case 2:
@@ -106,7 +111,7 @@
// baseWarpper.setId(3);
// break;
case 4:
- baseWarpper.setName(language == 1 ? "市内小件物流" : language == 2 ? "Small logistics in the city" : "Petite logistique en ville");
+ baseWarpper.setName(language == 1 ? "包裹" : language == 2 ? "Delivery" : "Livraison");
baseWarpper.setId(4);
break;
// case 5:
--
Gitblit v1.7.1