From 1d9f7b0cf4251f3058badb07dd7a2bc06b6bc09a Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期五, 11 四月 2025 10:05:32 +0800
Subject: [PATCH] bug修改
---
cloud-server-other/src/main/java/com/dsh/other/controller/StoreController.java | 50 +++++++++++++++++++++++++++++---------------------
1 files changed, 29 insertions(+), 21 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 630a5d1..24c18f3 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
@@ -12,14 +12,17 @@
import com.dsh.other.util.GeodesyUtil;
import com.dsh.other.util.ResultUtil;
import com.dsh.other.util.ToolUtil;
+import com.sun.javafx.binding.StringFormatter;
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams;
import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import java.math.BigDecimal;
import java.math.RoundingMode;
+import java.text.DecimalFormat;
import java.util.*;
import java.util.stream.Collectors;
@@ -30,7 +33,6 @@
@Autowired
private StoreService storeService;
-
@Autowired
private GDMapGeocodingUtil gdMapGeocodingUtil;
@@ -39,6 +41,14 @@
@Autowired
private TBackRecordService backRecordService;
+
+ @Autowired
+ private TStoreOtherConfigTrueService tStoreOtherConfigTrueService;
+
+
+
+
+
/**
* 获取根据门店id 获取店长信息
@@ -125,8 +135,8 @@
for (Store store : storeList) {
String storeLon = store.getLon();
String storeLat = store.getLat();
- String result = storeLon + "," + storeLat;
- String distanceTOKilometer = gdMapGeocodingUtil.getDistanceTOKilometer(current, result);
+// String result = storeLon + "," + storeLat;
+// String distanceTOKilometer = gdMapGeocodingUtil.getDistanceTOKilometer(current, result);
long l = 0;
// try {
// l = Long.parseLong(distanceTOKilometer);
@@ -137,7 +147,11 @@
info.setStoreId(store.getId());
info.setStoreName(store.getName());
info.setStoreImg(store.getCoverDrawing());
- info.setDistance((long) Double.parseDouble(distanceTOKilometer));
+// info.setDistance( Double.parseDouble(distanceTOKilometer));
+
+ Map<String, Double> distance = GeodesyUtil.getDistance(list.getLongitude() + "," + list.getLatitude(), storeLon + "," + storeLat);
+ double wgs84 = new BigDecimal(distance.get("WGS84")).divide(new BigDecimal(1000)).setScale(2, RoundingMode.HALF_EVEN).doubleValue();
+ info.setDistance(wgs84);
String str = store.getAddress();
@@ -198,37 +212,29 @@
if (citycodeResp.getCityCode() == null) {
Map<String, String> geocode = gdMapGeocodingUtil.geocode(citycodeResp.getLongitude(), citycodeResp.getLatitude());
- String provinceCode = geocode.get("provinceCode");
- String cityCode = geocode.get("cityCode");
- citycodeResp.setCityCode(cityCode);
+ if(null != geocode){
+ String cityCode = geocode.get("cityCode");
+ citycodeResp.setCityCode(cityCode);
+ }
}
List<Store> list = storeService.list(new QueryWrapper<Store>()
.eq("state", 1)
.eq("cityCode", citycodeResp.getCityCode()));
if (list.size() > 0) {
-// if (ToolUtil.isEmpty(citycodeResp.getLongitude()) && ToolUtil.isEmpty(citycodeResp.getLatitude())){
-// return detailLists;
-// }
for (Store store : list) {
String current = citycodeResp.getLongitude() + "," + citycodeResp.getLatitude();
String result = store.getLon() + "," + store.getLat();
- String distanceTOKilometer = gdMapGeocodingUtil.getDistanceTOKilometer(current, result);
-// long l = Long.parseLong(distanceTOKilometer);
-//// 取5公里范围内的门店
-// if ( l > 5){
-// continue;
-// }
+ Map<String, Double> distance = GeodesyUtil.getDistance(current, result);
StoreDetailList detailList = new StoreDetailList();
detailList.setStoreId(store.getId());
detailList.setStoreImg(store.getCoverDrawing());
detailList.setStoreName(store.getName());
detailList.setStoreAddress(store.getAddress());
detailList.setStorePhone(store.getPhone());
-// detailList.setStoreDistance(l);
detailList.setStoreTime(store.getStartTime() + "-" + store.getEndTime());
detailList.setStoreInfo(store.getIntroduce());
- detailList.setStoreDistance(Double.valueOf(distanceTOKilometer));
+ detailList.setStoreDistance(null != distance ? Double.valueOf(String.format("%.2f", distance.get("WGS84") / 1000)) : 0D);
detailLists.add(detailList);
}
}
@@ -409,12 +415,13 @@
}
}
- @Autowired
- private TStoreOtherConfigTrueService tStoreOtherConfigTrueService;
+
+
+
@ResponseBody
@PostMapping("/base/store/queryIndexSet")
- @ApiOperation(value = "获取门店首页设置 2.0", tags = {"APP-免费福利"})
+ @ApiOperation(value = "获取门店首页设置", tags = {"APP-免费福利"})
@ApiImplicitParams({
@ApiImplicitParam(value = "门店id", name = "id", dataType = "int", required = true),
})
@@ -432,6 +439,7 @@
tStoreOtherConfigTrue.setSort(tStoreOther.getSort());
}
}
+ tStoreOtherConfigTrue.setDisplayType(2);
}
return ResultUtil.success(tStoreOtherConfigTrues);
} catch (Exception e) {
--
Gitblit v1.7.1