From 6af0c7434178ca41e727c700af8174201a865de9 Mon Sep 17 00:00:00 2001
From: nickchange <126672920+nickchange@users.noreply.github.com>
Date: 星期四, 02 十一月 2023 11:55:29 +0800
Subject: [PATCH] 10.31.8
---
cloud-server-other/src/main/java/com/dsh/other/controller/StoreController.java | 82 ++++++++++++++++++++++++++++++-----------
1 files changed, 60 insertions(+), 22 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 6732193..97c999d 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
@@ -3,10 +3,7 @@
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.dsh.other.entity.Store;
-import com.dsh.other.entity.TBackRecord;
-import com.dsh.other.entity.TStoreOther;
-import com.dsh.other.entity.TStoreOtherConfigTrue;
+import com.dsh.other.entity.*;
import com.dsh.other.feignclient.model.*;
import com.dsh.other.model.*;
import com.dsh.other.service.*;
@@ -38,6 +35,7 @@
@Autowired
private TBackRecordService backRecordService;
+
/**
* 根据城市管理员id获取门店
@@ -116,28 +114,29 @@
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.getRealPicture());
- info.setDistance(l);
+ info.setStoreImg(store.getCoverDrawing());
+ info.setDistance((long) Double.parseDouble(distanceTOKilometer));
info.setStoreAddr(store.getAddress());
info.setLatitude(storeLat);
info.setLongitude(storeLon);
storeInfos.add(info);
}
- Comparator<StoreInfo> distanceComparator = new Comparator<StoreInfo>() {
- @Override
- public int compare(StoreInfo store1, StoreInfo store2) {
- return Long.compare(store1.getDistance(), store2.getDistance());
- }
- };
- Collections.sort(storeInfos, distanceComparator);
+// Comparator<StoreInfo> distanceComparator = new Comparator<StoreInfo>() {
+// @Override
+// public int compare(StoreInfo store1, StoreInfo store2) {
+// return Long.compare(store1.getDistance(), store2.getDistance());
+// }
+// };
+// Collections.sort(storeInfos, distanceComparator);
+ storeInfos = storeInfos.stream().sorted(Comparator.comparing(StoreInfo::getDistance)).collect(Collectors.toList());
}
return storeInfos;
}
@@ -219,8 +218,17 @@
@PostMapping("/store/queryStoreByIds")
public List<Store> queryStoreByIds(@RequestBody List<Integer> ids){
try {
- return storeService.list(new LambdaQueryWrapper<Store>()
- .in(Store::getId,ids));
+ List<Store> list = storeService.list(new LambdaQueryWrapper<Store>()
+ .in(Store::getId, ids));
+ for (Store store : list) {
+ Integer operatorId = store.getOperatorId();
+ if(operatorId == null){
+ operatorId=-1;
+ }
+ String name = storeService.getOName(operatorId);
+ store.setOName(name);
+ }
+ return list;
}catch (Exception e){
e.printStackTrace();
return new ArrayList<>();
@@ -237,6 +245,14 @@
e.printStackTrace();
return new ArrayList<>();
}
+ }
+
+ @ResponseBody
+ @PostMapping("/store/querySiteIdById")
+ public List<Integer> querySiteIdById(@RequestBody List<Integer> storeIds){
+ List<Site> list = siteService.list(new LambdaQueryWrapper<Site>().in(Site::getStoreId, storeIds));
+ List<Integer> collect = list.stream().map(Site::getId).collect(Collectors.toList());
+ return collect;
}
@@ -292,6 +308,28 @@
e.printStackTrace();
return null;
}
+ }
+
+ @ResponseBody
+ @PostMapping("/store/queryByStoreId")
+ public OperatorUser queryByStoreId(@RequestBody Integer id){
+ try {
+ return storeService.queryByStoreId(id);
+ }catch (Exception e){
+ e.printStackTrace();
+ return null;
+ }
+ }
+
+
+ @Autowired
+ private ISiteService siteService;
+ @ResponseBody
+ @PostMapping("/store/querySiteId")
+ public List<Integer> querySiteId(@RequestBody Integer storeId){
+ List<Site> list = siteService.list(new LambdaQueryWrapper<Site>().eq(Site::getStoreId, storeId).eq(Site::getSign, 1));
+ List<Integer> collect = list.stream().map(Site::getId).collect(Collectors.toList());
+ return collect;
}
@@ -396,9 +434,9 @@
@ApiImplicitParams({
@ApiImplicitParam(value = "城市code", name = "cityCode", dataType = "string", required = true),
})
- public ResultUtil<List<BaseVo>> queryStoreByCityCode(String cityCode){
+ public ResultUtil<List<BaseVo>> queryStoreByCityCode(String provinceCode,String cityCode){
try {
- List<BaseVo> list = storeService.queryStoreByCityCode(cityCode);
+ List<BaseVo> list = storeService.queryStoreByCityCode(provinceCode,cityCode);
return ResultUtil.success(list);
}catch (Exception e){
e.printStackTrace();
--
Gitblit v1.7.1