From f195cf48cf57635c8848b2bc32afd4541c4090ed Mon Sep 17 00:00:00 2001 From: puzhibing <393733352@qq.com> Date: 星期一, 17 七月 2023 08:57:25 +0800 Subject: [PATCH] 更新接口 --- cloud-server-other/src/main/java/com/dsh/other/controller/StoreController.java | 98 ++++++++++++++++++++++++++++++++++++++++++++++-- 1 files changed, 93 insertions(+), 5 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 344a813..90cf2e4 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,16 +3,14 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.dsh.other.entity.Store; -import com.dsh.other.feignclient.model.GetAllNearbyStoreList; -import com.dsh.other.feignclient.model.StoreDetailOfCourse; -import com.dsh.other.feignclient.model.StoreInfo; -import com.dsh.other.feignclient.model.StoreLonLatList; +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.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; @@ -83,6 +81,20 @@ Collections.sort(storeInfos, distanceComparator); } return storeInfos; + } + + /** + * 根据门店坐标与传入坐标,计算距离 + * @param distanceVo + * @return + */ + @PostMapping("/base/protocol/storeDetail/distanceCal") + public long 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); } @@ -186,4 +198,80 @@ } } + + + + @ResponseBody + @PostMapping("/base/store/queryStoreFreeBenefit") + @ApiOperation(value = "获取门店免费福利", tags = {"APP-免费福利"}) + @ApiImplicitParams({ + @ApiImplicitParam(value = "门店id", name = "id", dataType = "int", required = true), + }) + public ResultUtil<StoreFreeBenefitVo> queryStoreFreeBenefit(Integer id){ + try { + Store store = storeService.getById(id); + StoreFreeBenefitVo storeFreeBenefitVo = new StoreFreeBenefitVo(); + storeFreeBenefitVo.setPhone(store.getPhone()); + storeFreeBenefitVo.setImg(store.getWelfarePicture()); + return ResultUtil.success(storeFreeBenefitVo); + }catch (Exception e){ + e.printStackTrace(); + return ResultUtil.runErr(); + } + } + + + + + @ResponseBody + @PostMapping("/base/store/queryProvinceAndCity") + @ApiOperation(value = "获取省市数据", tags = {"APP-加入玩湃"}) + @ApiImplicitParams({ + @ApiImplicitParam(value = "省编号", name = "pcode", dataType = "string", required = false), + }) + public ResultUtil<List<ProvinceAndCityVo>> queryProvinceAndCity(String pcode){ + try { + List<ProvinceAndCityVo> provinceAndCityVos = storeService.queryProvinceAndCity(pcode); + return ResultUtil.success(provinceAndCityVos); + }catch (Exception e){ + e.printStackTrace(); + return ResultUtil.runErr(); + } + } + + + + + @ResponseBody + @PostMapping("/base/store/queryAllCity") + @ApiOperation(value = "获取所有开通城市", tags = {"APP-赛事活动列表"}) + @ApiImplicitParams({ + }) + public ResultUtil<List<ProvinceAndCityVo>> queryAllCity(){ + try { + List<ProvinceAndCityVo> provinceAndCityVos = storeService.queryAllCity(); + return ResultUtil.success(provinceAndCityVos); + }catch (Exception e){ + e.printStackTrace(); + return ResultUtil.runErr(); + } + } + + + + @ResponseBody + @PostMapping("/base/store/queryStoreByCityCode") + @ApiOperation(value = "获取城市code获取门店", tags = {"APP-加入玩湃"}) + @ApiImplicitParams({ + @ApiImplicitParam(value = "城市code", name = "cityCode", dataType = "string", required = true), + }) + public ResultUtil<List<BaseVo>> queryStoreByCityCode(String cityCode){ + try { + List<BaseVo> list = storeService.queryStoreByCityCode(cityCode); + return ResultUtil.success(list); + }catch (Exception e){ + e.printStackTrace(); + return ResultUtil.runErr(); + } + } } -- Gitblit v1.7.1