From d09828cdec78a160f4530a8ab245216ed8671c27 Mon Sep 17 00:00:00 2001
From: liujie <liujie>
Date: 星期三, 20 九月 2023 18:43:48 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
cloud-server-other/src/main/java/com/dsh/other/controller/StoreController.java | 139 +++++++++++++++++++++++++++++++++++----------
1 files changed, 107 insertions(+), 32 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 90cf2e4..9dc6cfa 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
@@ -1,16 +1,15 @@
package com.dsh.other.controller;
+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.feignclient.model.*;
-import com.dsh.other.model.BaseVo;
-import com.dsh.other.model.ProvinceAndCityVo;
-import com.dsh.other.model.QueryStoreList;
-import com.dsh.other.model.StoreFreeBenefitVo;
+import com.dsh.other.model.*;
import com.dsh.other.service.StoreService;
import com.dsh.other.util.GDMapGeocodingUtil;
import com.dsh.other.util.ResultUtil;
+import com.dsh.other.util.ToolUtil;
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams;
import io.swagger.annotations.ApiOperation;
@@ -31,6 +30,46 @@
private GDMapGeocodingUtil gdMapGeocodingUtil;
+ /**
+ * 根据城市管理员id获取门店
+ */
+ @RequestMapping("base/site/getStoreByCityManagerId")
+ public Object getStoreByCityManagerId(@RequestBody Integer id){
+ return storeService.getStoreByCityManagerId(id);
+ }
+ /**
+ * 根据员工id获取门店
+ */
+ @RequestMapping("base/site/getStoreByStoreStaffId")
+ public Object getStoreByStoreStaffId(@RequestBody Integer id){
+ return storeService.getStoreByStoreStaffId(id);
+ }
+
+ /**
+ * 根据门店id获取门店信息
+ */
+ @RequestMapping("base/site/getStoreById")
+ public Store getStoreById(@RequestBody Integer id){
+ return storeService.getOne(new QueryWrapper<Store>().eq("id",id));
+ }
+ /**
+ * 选择市区 展示全部门店
+ */
+ @RequestMapping("base/store/getStore")
+ public List<Store> getStore(@RequestBody String city){
+ return storeService.list(new QueryWrapper<Store>().eq("city",city));
+ }
+
+ /**
+ * 根据所选门店 查询经营时间
+ * @param oneId
+ * @return
+ */
+ @RequestMapping("base/store/getTime")
+ public Store getTime(@RequestBody String oneId){
+ return storeService.getOne(new QueryWrapper<Store>().eq("name",oneId));
+ }
+
@PostMapping("/base/protocol/storeDetail/courseOfSto")
@@ -46,8 +85,11 @@
@PostMapping("/base/protocol/storeDetail/nearbyStore")
public List<StoreInfo> getAllNearbyStoreList(@RequestBody GetAllNearbyStoreList list ){
- String current = list.getLongitude()+","+list.getLatitude();
List<StoreInfo> storeInfos = new ArrayList<>();
+ if (ToolUtil.isEmpty(list.getLongitude()) && ToolUtil.isEmpty(list.getLatitude())){
+ return storeInfos;
+ }
+ String current = list.getLongitude()+","+list.getLatitude();
String cityCode = "";
try {
Map<String, String> geocode = gdMapGeocodingUtil.geocode(list.getLongitude(), list.getLatitude());
@@ -64,12 +106,20 @@
String storeLat = store.getLat();
String result = storeLon+","+storeLat;
String distanceTOKilometer = gdMapGeocodingUtil.getDistanceTOKilometer(current, result);
+ long 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(Long.parseLong(distanceTOKilometer));
+ info.setDistance(l);
info.setStoreAddr(store.getAddress());
+ info.setLatitude(storeLat);
+ info.setLongitude(storeLon);
storeInfos.add(info);
}
Comparator<StoreInfo> distanceComparator = new Comparator<StoreInfo>() {
@@ -89,37 +139,46 @@
* @return
*/
@PostMapping("/base/protocol/storeDetail/distanceCal")
- public long calculateDistance(@RequestBody GetDistanceVo distanceVo){
+ public String calculateDistance(@RequestBody GetDistanceVo distanceVo){
String current = distanceVo.getLongitude()+","+distanceVo.getLatitude();
Store store = storeService.getById(distanceVo.getStoreId());
String result = store.getLon()+","+store.getLat();
- String distanceTOKilometer = gdMapGeocodingUtil.getDistanceTOKilometer(current, result);
- return Long.parseLong(distanceTOKilometer);
+ return gdMapGeocodingUtil.getDistanceTOKilometer(current, result);
}
- @PostMapping("/base/protocol/storeDetail/storeOfLonLat")
- public List<StoreLonLatList> getAllStoreLonLats(@RequestBody GetAllNearbyStoreList list ){
- List<StoreLonLatList> storeInfos = new ArrayList<>();
- try {
- Map<String, String> geocode = gdMapGeocodingUtil.geocode(list.getLongitude(), list.getLatitude());
- String cityCode = geocode.get("cityCode");
- List<Store> storeList = storeService.list(new QueryWrapper<Store>()
- .eq("cityCode",cityCode));
- if (storeList.size() > 0){
- for (Store store : storeList) {
- StoreLonLatList latList = new StoreLonLatList();
- latList.setStoreId(store.getId());
- latList.setLongitude(store.getLon());
- latList.setLatitude(store.getLat());
- storeInfos.add(latList);
- }
+ @PostMapping("/base/protocol/storeDetail/citycodeLoLa")
+ public List<StoreDetailList> getQueryStoreList(@RequestBody StoreOfCitycodeResp citycodeResp){
+ List<StoreDetailList> detailLists = new ArrayList<>();
+ 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;
}
- }catch (Exception e){
- e.printStackTrace();
+ 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;
+ }
+ 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());
+ detailLists.add(detailList);
+ }
}
-
- return storeInfos;
+ return detailLists;
}
@@ -143,12 +202,28 @@
}
+ /**
+ * 获取门店列表
+ * @return
+ */
+ @ResponseBody
+ @PostMapping("/store/queryStoreByIds")
+ public List<Store> queryStoreByIds(@RequestBody List<Integer> ids){
+ try {
+ return storeService.list(new LambdaQueryWrapper<Store>()
+ .in(Store::getId,ids));
+ }catch (Exception e){
+ e.printStackTrace();
+ return new ArrayList<>();
+ }
+ }
+
@ResponseBody
@PostMapping("/base/store/queryStoreLists")
- @ApiOperation(value = "获取门店列表", tags = {"APP-加入玩湃", "APP-课程列表"})
+ @ApiOperation(value = "获取门店列表", tags = {"APP-加入玩湃", "APP-课程列表", "用户—预约场地"})
@ApiImplicitParams({
@ApiImplicitParam(value = "经纬", name = "lon", dataType = "string", required = false),
@ApiImplicitParam(value = "纬度", name = "lat", dataType = "string", required = false),
@@ -171,7 +246,7 @@
*/
@ResponseBody
@PostMapping("/store/queryStoreListByName")
- public List<Store> queryStoreListByName(@RequestParam("name") String name){
+ public List<Store> queryStoreListByName(@RequestBody String name){
try {
List<Store> stores = storeService.list(new QueryWrapper<Store>().eq("state", 1).like("name", name));
return stores;
@@ -244,7 +319,7 @@
@ResponseBody
@PostMapping("/base/store/queryAllCity")
- @ApiOperation(value = "获取所有开通城市", tags = {"APP-赛事活动列表"})
+ @ApiOperation(value = "获取所有开通城市", tags = {"APP-赛事活动列表", "用户—预约场地"})
@ApiImplicitParams({
})
public ResultUtil<List<ProvinceAndCityVo>> queryAllCity(){
--
Gitblit v1.7.1