From d8bfa0bc04c65929f9f370f2ad1d0b8ff445805d Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期二, 04 七月 2023 08:59:44 +0800
Subject: [PATCH] 合并代码处理冲突
---
cloud-server-other/src/main/java/com/dsh/other/controller/StoreController.java | 96 +++--------------------------------------------
1 files changed, 7 insertions(+), 89 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 5c19204..76be081 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
@@ -20,7 +20,7 @@
import java.util.*;
@RestController
-@RequestMapping("/base/protocol")
+@RequestMapping("")
public class StoreController {
@Autowired
@@ -33,10 +33,10 @@
- @PostMapping("/storeDetail/courseOfSto")
+ @PostMapping("/base/protocol/storeDetail/courseOfSto")
public StoreDetailOfCourse getCourseOfStore(@RequestBody Integer storeId){
StoreDetailOfCourse ofCourse = new StoreDetailOfCourse();
- Store store = stoService.getById(storeId);
+ Store store = storeService.getById(storeId);
if (null != store){
ofCourse.setStoreName(store.getName());
ofCourse.setStoreAddr(store.getAddress());
@@ -44,7 +44,7 @@
return ofCourse;
}
- @PostMapping("/storeDetail/nearbyStore")
+ @PostMapping("/base/protocol/storeDetail/nearbyStore")
public List<StoreInfo> getAllNearbyStoreList(@RequestBody String longitude,@RequestBody String latitude){
String current = longitude+","+latitude;
List<StoreInfo> storeInfos = new ArrayList<>();
@@ -55,7 +55,7 @@
}catch (Exception e){
e.printStackTrace();
}
- List<Store> storeList = stoService.list(new QueryWrapper<Store>()
+ List<Store> storeList = storeService.list(new QueryWrapper<Store>()
.eq("state", 1)
.eq("cityCode",cityCode));
if (storeList.size() > 0){
@@ -84,13 +84,13 @@
}
- @PostMapping("/storeDetail/storeOfLonLat")
+ @PostMapping("/base/protocol/storeDetail/storeOfLonLat")
public List<StoreLonLatList> getAllStoreLonLats(@RequestBody String longitude, @RequestBody String latitude){
List<StoreLonLatList> storeInfos = new ArrayList<>();
try {
Map<String, String> geocode = gdMapGeocodingUtil.geocode(longitude, latitude);
String cityCode = geocode.get("cityCode");
- List<Store> storeList = stoService.list(new QueryWrapper<Store>()
+ List<Store> storeList = storeService.list(new QueryWrapper<Store>()
.eq("cityCode",cityCode));
if (storeList.size() > 0){
for (Store store : storeList) {
@@ -192,86 +192,4 @@
}
}
-
-
-
-
- /**
- * 获取门店列表
- * @param provinceCode
- * @param cityCode
- * @return
- */
- @ResponseBody
- @PostMapping("/store/queryStoreList")
- public List<Store> queryStoreList(@RequestBody String provinceCode, @RequestBody String cityCode){
- try {
- return storeService.queryStorsList(provinceCode, cityCode);
- }catch (Exception e){
- e.printStackTrace();
- return new ArrayList<>();
- }
- }
-
-
-
-
-
- @ResponseBody
- @PostMapping("/base/store/queryStoreLists")
- @ApiOperation(value = "获取门店列表", tags = {"APP-加入玩湃"})
- @ApiImplicitParams({
- @ApiImplicitParam(value = "经纬", name = "lon", dataType = "string", required = true),
- @ApiImplicitParam(value = "纬度", name = "lat", dataType = "string", required = true),
- })
- public ResultUtil<List<BaseVo>> queryStoreLists(@RequestBody String lon, @RequestBody String lat){
- if(ToolUtil.isEmpty(lon)){
- return ResultUtil.paranErr("lon");
- }
- if(ToolUtil.isEmpty(lat)){
- return ResultUtil.paranErr("lat");
- }
- try {
- List<BaseVo> baseVos = storeService.queryStoreLists(lon, lat);
- return ResultUtil.success(baseVos);
- }catch (Exception e){
- e.printStackTrace();
- return ResultUtil.runErr();
- }
- }
-
-
- /**
- * 根据门店模糊搜索店铺
- * @param name
- * @return
- */
- @ResponseBody
- @PostMapping("/store/queryStoreListByName")
- public List<Store> queryStoreListByName(@RequestBody String name){
- try {
- List<Store> stores = storeService.list(new QueryWrapper<Store>().eq("state", 1).like("name", name));
- return stores;
- }catch (Exception e){
- e.printStackTrace();
- return new ArrayList<>();
- }
- }
-
-
- /**
- * 根据门店
- * @param id
- * @return
- */
- @ResponseBody
- @PostMapping("/store/queryStoreById")
- public Store queryStoreById(@RequestBody Integer id){
- try {
- return storeService.getById(id);
- }catch (Exception e){
- e.printStackTrace();
- return null;
- }
- }
}
--
Gitblit v1.7.1