From 8b09fbc19a96b57bf1d0e4d7c79b51a76aeca554 Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期五, 28 三月 2025 19:57:56 +0800
Subject: [PATCH] 修改bug
---
UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/OpenCityBusinessServiceImpl.java | 89 +++++++++++++++++++++++++-------------------
1 files changed, 50 insertions(+), 39 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 45b4c8b..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,8 +32,12 @@
* @throws Exception
*/
@Override
- public List<BaseWarpper> queryBusiness(Double lat, Double lnt) throws Exception {
- ReverseGeocodeVo reverseGeocode = GoogleMapUtil.getReverseGeocode(lat, lnt);
+ public List<BaseWarpper> queryBusiness(Integer uid, Double lat, Double lnt, Integer language) throws Exception {
+ if(null == language){
+ language = 2;
+ }
+ String tripId = redisUtil.getValue("trip" + uid);
+ ReverseGeocodeVo reverseGeocode = GoogleMapUtil.getReverseGeocode(lat, lnt, tripId);
if(null == reverseGeocode){
return new ArrayList<>();
}
@@ -44,29 +52,29 @@
BaseWarpper baseWarpper = new BaseWarpper();
switch (b.getBusinessType()){
case 1:
- baseWarpper.setName("专车");
+ baseWarpper.setName(language == 1 ? "打车" : language == 2 ? "Ride" : "Course");
baseWarpper.setId(1);
break;
- case 2:
- baseWarpper.setName("出租车");
- baseWarpper.setId(2);
- break;
- case 3:
- baseWarpper.setName("跨城出行");
- baseWarpper.setId(3);
- break;
+// case 2:
+// baseWarpper.setName(language == 1 ? "出租车" : language == 2 ? "" : "");
+// baseWarpper.setId(2);
+// break;
+// case 3:
+// baseWarpper.setName(language == 1 ? "跨城出行" : language == 2 ? "" : "");
+// baseWarpper.setId(3);
+// break;
case 4:
- baseWarpper.setName("同城小件物流");
+ baseWarpper.setName(language == 1 ? "包裹" : language == 2 ? "Delivery" : "Livraison");
baseWarpper.setId(4);
break;
- case 5:
- baseWarpper.setName("跨城小件物流");
- baseWarpper.setId(5);
- break;
- case 6:
- baseWarpper.setName("包车");
- baseWarpper.setId(6);
- break;
+// case 5:
+// baseWarpper.setName(language == 1 ? "跨城小件物流" : language == 2 ? "" : "");
+// baseWarpper.setId(5);
+// break;
+// case 6:
+// baseWarpper.setName(language == 1 ? "包车" : language == 2 ? "" : "");
+// baseWarpper.setId(6);
+// break;
}
list.add(baseWarpper);
}
@@ -81,36 +89,39 @@
* @throws Exception
*/
@Override
- public List<BaseWarpper> queryBusinessById(Integer id) throws Exception {
+ public List<BaseWarpper> queryBusinessById(Integer id, Integer language) throws Exception {
+ if(null == language){
+ language = 2;
+ }
List<OpenCityBusiness> openCityBusinesses = openCityBusinessMapper.queryBusinessById(id);
List<BaseWarpper> list = new ArrayList<>();
for(OpenCityBusiness b : openCityBusinesses){
BaseWarpper baseWarpper = new BaseWarpper();
switch (b.getBusinessType()){
case 1:
- baseWarpper.setName("专车");
+ baseWarpper.setName(language == 1 ? "打车" : language == 2 ? "Ride" : "Course");
baseWarpper.setId(1);
break;
- case 2:
- baseWarpper.setName("出租车");
- baseWarpper.setId(2);
- break;
- case 3:
- baseWarpper.setName("跨城出行");
- baseWarpper.setId(3);
- break;
+// case 2:
+// baseWarpper.setName("出租车");
+// baseWarpper.setId(2);
+// break;
+// case 3:
+// baseWarpper.setName("跨城出行");
+// baseWarpper.setId(3);
+// break;
case 4:
- baseWarpper.setName("同城小件物流");
+ baseWarpper.setName(language == 1 ? "包裹" : language == 2 ? "Delivery" : "Livraison");
baseWarpper.setId(4);
break;
- case 5:
- baseWarpper.setName("跨城小件物流");
- baseWarpper.setId(5);
- break;
- case 6:
- baseWarpper.setName("包车");
- baseWarpper.setId(6);
- break;
+// case 5:
+// baseWarpper.setName("跨城小件物流");
+// baseWarpper.setId(5);
+// break;
+// case 6:
+// baseWarpper.setName("包车");
+// baseWarpper.setId(6);
+// break;
}
list.add(baseWarpper);
}
--
Gitblit v1.7.1