From 8c55ab2701c99cec16eff92a26fefdf77fcdd28f Mon Sep 17 00:00:00 2001
From: liujie <liujie>
Date: 星期一, 25 九月 2023 16:17:44 +0800
Subject: [PATCH] app接口修改
---
cloud-server-other/src/main/java/com/dsh/other/controller/StoreController.java | 113 +++++++++++++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 106 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 0ee10ba..5f79d70 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,11 +1,16 @@
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.entity.TStoreOther;
+import com.dsh.other.entity.TStoreOtherConfigTrue;
import com.dsh.other.feignclient.model.*;
import com.dsh.other.model.*;
import com.dsh.other.service.StoreService;
+import com.dsh.other.service.TStoreOtherConfigTrueService;
+import com.dsh.other.service.TStoreOtherService;
import com.dsh.other.util.GDMapGeocodingUtil;
import com.dsh.other.util.ResultUtil;
import com.dsh.other.util.ToolUtil;
@@ -28,6 +33,48 @@
@Autowired
private GDMapGeocodingUtil gdMapGeocodingUtil;
+ @Autowired
+ private TStoreOtherService tStoreOtherService;
+
+ /**
+ * 根据城市管理员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));
+ }
@@ -44,8 +91,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());
@@ -62,11 +112,17 @@
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);
@@ -89,12 +145,11 @@
* @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);
}
@@ -105,12 +160,16 @@
.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);
- if (ToolUtil.isNotEmpty(citycodeResp.getSpace()) && l > citycodeResp.getSpace()){
+// 取5公里范围内的门店
+ if ( l > 5){
continue;
}
StoreDetailList detailList = new StoreDetailList();
@@ -149,6 +208,22 @@
}
+ /**
+ * 获取门店列表
+ * @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<>();
+ }
+ }
+
@@ -177,7 +252,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;
@@ -226,6 +301,30 @@
}
}
+ @Autowired
+ private TStoreOtherConfigTrueService tStoreOtherConfigTrueService;
+ @ResponseBody
+ @PostMapping("/base/store/queryIndexSet")
+ @ApiOperation(value = "获取门店首页设置 2.0", tags = {"APP-免费福利"})
+ @ApiImplicitParams({
+ @ApiImplicitParam(value = "门店id", name = "id", dataType = "int", required = true),
+ })
+ public ResultUtil<List<TStoreOtherConfigTrue>> queryIndexSet(Integer id){
+ try {
+ List<TStoreOtherConfigTrue> tStoreOtherConfigTrues = new ArrayList<>();
+
+ List<TStoreOther> list = tStoreOtherService.list(new LambdaQueryWrapper<TStoreOther>().eq(TStoreOther::getStoreId, id));
+ if(list.size()>0){
+ tStoreOtherConfigTrues= tStoreOtherConfigTrueService.list(new LambdaQueryWrapper<TStoreOtherConfigTrue>().eq(TStoreOtherConfigTrue::getPid, list.get(0).getId()));
+ }
+ return ResultUtil.success(tStoreOtherConfigTrues);
+ }catch (Exception e){
+ e.printStackTrace();
+ return ResultUtil.runErr();
+ }
+ }
+
+
--
Gitblit v1.7.1