From c036557db88c6297b9a626a892dce35c14ab8ee5 Mon Sep 17 00:00:00 2001
From: nickchange <126672920+nickchange@users.noreply.github.com>
Date: 星期四, 09 十一月 2023 18:30:31 +0800
Subject: [PATCH] 11.6
---
cloud-server-other/src/main/java/com/dsh/other/controller/StoreController.java | 34 +++++++++++++++++++++++++++-------
1 files changed, 27 insertions(+), 7 deletions(-)
diff --git a/cloud-server-other/src/main/java/com/dsh/other/controller/StoreController.java b/cloud-server-other/src/main/java/com/dsh/other/controller/StoreController.java
index 6e23ca2..4e1dabd 100644
--- a/cloud-server-other/src/main/java/com/dsh/other/controller/StoreController.java
+++ b/cloud-server-other/src/main/java/com/dsh/other/controller/StoreController.java
@@ -6,6 +6,7 @@
import com.dsh.other.entity.*;
import com.dsh.other.feignclient.model.*;
import com.dsh.other.model.*;
+import com.dsh.other.model.dto.siteDto.StoreInfoDto;
import com.dsh.other.service.*;
import com.dsh.other.util.GDMapGeocodingUtil;
import com.dsh.other.util.ResultUtil;
@@ -36,7 +37,14 @@
@Autowired
private TBackRecordService backRecordService;
+ /**
+ * 获取根据门店id 获取店长信息
+ */
+ @RequestMapping(value = "/getStoreInfo")
+ public StoreInfoDto getStoreInfo(@RequestBody Integer id){
+ return storeService.getStoreInfo(id);
+ }
/**
* 根据城市管理员id获取门店
*/
@@ -114,19 +122,31 @@
String result = storeLon+","+storeLat;
String distanceTOKilometer = gdMapGeocodingUtil.getDistanceTOKilometer(current, result);
long l = 0;
- try {
- l = Long.parseLong(distanceTOKilometer);
- }catch (Exception e){
- l = 0;
- }
+// try {
+// l = Long.parseLong(distanceTOKilometer);
+// }catch (Exception e){
+// l = 0;
+// }
StoreInfo info = new StoreInfo();
info.setStoreId(store.getId());
info.setStoreName(store.getName());
info.setStoreImg(store.getCoverDrawing());
- info.setDistance(l);
- info.setStoreAddr(store.getAddress());
+ info.setDistance((long) Double.parseDouble(distanceTOKilometer));
+
+
+ String str = store.getAddress();
+ str = str.substring(str.indexOf("省") + 1);
+
+ // 去掉第一个“市”及之前的字符串
+ str = str.substring(str.indexOf("市") + 1);
+
+ // 去掉第一个“区”及之前的字符串
+ str = str.substring(str.indexOf("区") + 1);
+
+ info.setStoreAddr(str);
info.setLatitude(storeLat);
info.setLongitude(storeLon);
+
storeInfos.add(info);
}
// Comparator<StoreInfo> distanceComparator = new Comparator<StoreInfo>() {
--
Gitblit v1.7.1