From aa925d851857f50eff0556411366690d9a78a0e5 Mon Sep 17 00:00:00 2001
From: 44323 <443237572@qq.com>
Date: 星期一, 27 十一月 2023 17:30:26 +0800
Subject: [PATCH] Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/PlayPai
---
cloud-server-other/src/main/java/com/dsh/other/controller/StoreController.java | 155 +++++++++++++++++++++++++--------------------------
1 files changed, 76 insertions(+), 79 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 3a55e2c..630a5d1 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
@@ -44,22 +44,24 @@
* 获取根据门店id 获取店长信息
*/
@RequestMapping(value = "/getStoreInfo")
- public StoreInfoDto getStoreInfo(@RequestBody Integer id){
+ public StoreInfoDto getStoreInfo(@RequestBody Integer id) {
return storeService.getStoreInfo(id);
}
+
/**
* 根据城市管理员id获取门店
*/
@RequestMapping("base/site/getStoreByCityManagerId")
- public Object getStoreByCityManagerId(@RequestBody Integer id){
+ public Object getStoreByCityManagerId(@RequestBody Integer id) {
return storeService.getStoreByCityManagerId(id);
}
+
/**
* 根据员工id获取门店
*/
@RequestMapping("base/site/getStoreByStoreStaffId")
- public Object getStoreByStoreStaffId(@RequestBody Integer id){
+ public Object getStoreByStoreStaffId(@RequestBody Integer id) {
return storeService.getStoreByStoreStaffId(id);
}
@@ -67,34 +69,35 @@
* 根据门店id获取门店信息
*/
@RequestMapping("base/site/getStoreById")
- public Store getStoreById(@RequestBody Integer id){
- return storeService.getOne(new QueryWrapper<Store>().eq("id",id));
+ 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));
+ 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));
+ public Store getTime(@RequestBody String oneId) {
+ return storeService.getOne(new QueryWrapper<Store>().eq("name", oneId));
}
-
@PostMapping("/base/protocol/storeDetail/courseOfSto")
- public StoreDetailOfCourse getCourseOfStore(@RequestBody Integer storeId){
+ public StoreDetailOfCourse getCourseOfStore(@RequestBody Integer storeId) {
StoreDetailOfCourse ofCourse = new StoreDetailOfCourse();
Store store = storeService.getById(storeId);
- if (null != store){
+ if (null != store) {
ofCourse.setStoreName(store.getName());
ofCourse.setStoreAddr(store.getAddress());
}
@@ -102,27 +105,27 @@
}
@PostMapping("/base/protocol/storeDetail/nearbyStore")
- public List<StoreInfo> getAllNearbyStoreList(@RequestBody GetAllNearbyStoreList list ){
+ public List<StoreInfo> getAllNearbyStoreList(@RequestBody GetAllNearbyStoreList list) {
List<StoreInfo> storeInfos = new ArrayList<>();
- if (ToolUtil.isEmpty(list.getLongitude()) && ToolUtil.isEmpty(list.getLatitude())){
+ if (ToolUtil.isEmpty(list.getLongitude()) && ToolUtil.isEmpty(list.getLatitude())) {
return storeInfos;
}
- String current = list.getLongitude()+","+list.getLatitude();
+ String current = list.getLongitude() + "," + list.getLatitude();
String cityCode = "";
try {
Map<String, String> geocode = gdMapGeocodingUtil.geocode(list.getLongitude(), list.getLatitude());
cityCode = geocode.get("cityCode");
- }catch (Exception e){
+ } catch (Exception e) {
e.printStackTrace();
}
List<Store> storeList = storeService.list(new QueryWrapper<Store>()
.eq("state", 1)
- .eq("cityCode",cityCode));
- if (storeList.size() > 0){
+ .eq("cityCode", cityCode));
+ if (storeList.size() > 0) {
for (Store store : storeList) {
String storeLon = store.getLon();
String storeLat = store.getLat();
- String result = storeLon+","+storeLat;
+ String result = storeLon + "," + storeLat;
String distanceTOKilometer = gdMapGeocodingUtil.getDistanceTOKilometer(current, result);
long l = 0;
// try {
@@ -166,21 +169,22 @@
/**
* 根据门店坐标与传入坐标，计算距离
+ *
* @param distanceVo
* @return
*/
@PostMapping("/base/protocol/storeDetail/distanceCal")
- public String calculateDistance(@RequestBody GetDistanceVo distanceVo){
- String current = distanceVo.getLongitude()+","+distanceVo.getLatitude();
+ 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 result = store.getLon() + "," + store.getLat();
- if(ToolUtil.isNotEmpty(distanceVo.getLongitude()) && ToolUtil.isNotEmpty(distanceVo.getLatitude())){
+ if (ToolUtil.isNotEmpty(distanceVo.getLongitude()) && ToolUtil.isNotEmpty(distanceVo.getLatitude())) {
Map<String, Double> distance = GeodesyUtil.getDistance(distanceVo.getLongitude() + "," + distanceVo.getLatitude(), store.getLon() + "," + store.getLat());
double wgs84 = new BigDecimal(distance.get("WGS84")).divide(new BigDecimal(1000)).setScale(2, RoundingMode.HALF_EVEN).doubleValue();
// packageResponse.setDistance(wgs84);
- return wgs84+"";
+ return wgs84 + "";
}
return "";
@@ -192,7 +196,7 @@
public List<StoreDetailList> getQueryStoreList(@RequestBody StoreOfCitycodeResp citycodeResp) throws Exception {
List<StoreDetailList> detailLists = new ArrayList<>();
- if (citycodeResp.getCityCode()==null){
+ if (citycodeResp.getCityCode() == null) {
Map<String, String> geocode = gdMapGeocodingUtil.geocode(citycodeResp.getLongitude(), citycodeResp.getLatitude());
String provinceCode = geocode.get("provinceCode");
String cityCode = geocode.get("cityCode");
@@ -200,15 +204,15 @@
}
List<Store> list = storeService.list(new QueryWrapper<Store>()
- .eq("state",1 )
- .eq("cityCode",citycodeResp.getCityCode()));
- if (list.size() > 0 ){
+ .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 current = citycodeResp.getLongitude() + "," + citycodeResp.getLatitude();
+ String result = store.getLon() + "," + store.getLat();
String distanceTOKilometer = gdMapGeocodingUtil.getDistanceTOKilometer(current, result);
// long l = Long.parseLong(distanceTOKilometer);
//// 取5公里范围内的门店
@@ -232,20 +236,17 @@
}
-
-
-
-
/**
* 获取门店列表
+ *
* @return
*/
@ResponseBody
@PostMapping("/store/queryStoreList")
- public List<Store> queryStoreList(QueryStoreList queryStoreList){
+ public List<Store> queryStoreList(QueryStoreList queryStoreList) {
try {
return storeService.queryStorsList(queryStoreList.getProvinceCode(), queryStoreList.getCityCode());
- }catch (Exception e){
+ } catch (Exception e) {
e.printStackTrace();
return new ArrayList<>();
}
@@ -254,24 +255,25 @@
/**
* 获取门店列表
+ *
* @return
*/
@ResponseBody
@PostMapping("/store/queryStoreByIds")
- public List<Store> queryStoreByIds(@RequestBody List<Integer> ids){
+ public List<Store> queryStoreByIds(@RequestBody List<Integer> ids) {
try {
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;
+ if (operatorId == null) {
+ operatorId = -1;
}
String name = storeService.getOName(operatorId);
store.setOName(name);
}
return list;
- }catch (Exception e){
+ } catch (Exception e) {
e.printStackTrace();
return new ArrayList<>();
}
@@ -279,11 +281,11 @@
@ResponseBody
@PostMapping("/store/queryStoreIdByCityCode")
- List<Integer> queryStoreIdByCityCode(@RequestBody List<String> collect){
+ List<Integer> queryStoreIdByCityCode(@RequestBody List<String> collect) {
try {
return storeService.list(new LambdaQueryWrapper<Store>()
- .in(Store::getCityCode,collect)).stream().map(Store::getId).collect(Collectors.toList());
- }catch (Exception e){
+ .in(Store::getCityCode, collect)).stream().map(Store::getId).collect(Collectors.toList());
+ } catch (Exception e) {
e.printStackTrace();
return new ArrayList<>();
}
@@ -291,12 +293,11 @@
@ResponseBody
@PostMapping("/store/querySiteIdById")
- public List<Integer> querySiteIdById(@RequestBody List<Integer> storeIds){
+ 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;
}
-
@ResponseBody
@@ -307,11 +308,11 @@
@ApiImplicitParam(value = "纬度", name = "lat", dataType = "string", required = false),
@ApiImplicitParam(value = "cityCode", name = "cityCode", dataType = "string", required = false),
})
- public ResultUtil<List<BaseVo>> queryStoreLists(String lon, String lat,String cityCode){
+ public ResultUtil<List<BaseVo>> queryStoreLists(String lon, String lat, String cityCode) {
try {
- List<BaseVo> baseVos = storeService.queryStoreLists(lon, lat,cityCode);
+ List<BaseVo> baseVos = storeService.queryStoreLists(lon, lat, cityCode);
return ResultUtil.success(baseVos);
- }catch (Exception e){
+ } catch (Exception e) {
e.printStackTrace();
return ResultUtil.runErr();
}
@@ -320,16 +321,17 @@
/**
* 根据门店模糊搜索店铺
+ *
* @param name
* @return
*/
@ResponseBody
@PostMapping("/store/queryStoreListByName")
- public List<Store> queryStoreListByName(@RequestBody 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;
- }catch (Exception e){
+ } catch (Exception e) {
e.printStackTrace();
return new ArrayList<>();
}
@@ -338,15 +340,16 @@
/**
* 根据门店
+ *
* @param id
* @return
*/
@ResponseBody
@PostMapping("/store/queryStoreById")
- public Store queryStoreById(@RequestBody Integer id){
+ public Store queryStoreById(@RequestBody Integer id) {
try {
return storeService.getById(id);
- }catch (Exception e){
+ } catch (Exception e) {
e.printStackTrace();
return null;
}
@@ -354,10 +357,10 @@
@ResponseBody
@PostMapping("/store/queryByStoreId")
- public OperatorUser queryByStoreId(@RequestBody Integer id){
+ public OperatorUser queryByStoreId(@RequestBody Integer id) {
try {
return storeService.queryByStoreId(id);
- }catch (Exception e){
+ } catch (Exception e) {
e.printStackTrace();
return null;
}
@@ -366,9 +369,10 @@
@Autowired
private ISiteService siteService;
+
@ResponseBody
@PostMapping("/store/querySiteId")
- public List<Integer> querySiteId(@RequestBody Integer storeId){
+ 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;
@@ -376,7 +380,7 @@
@PostMapping("/store/addBackRecord")
- public void addBackRecord(@RequestBody String s){
+ public void addBackRecord(@RequestBody String s) {
TBackRecord tBackRecord = new TBackRecord();
String[] split = s.split("_");
tBackRecord.setMoney(Double.valueOf(split[0]));
@@ -386,22 +390,20 @@
}
-
-
@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){
+ 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){
+ } catch (Exception e) {
e.printStackTrace();
return ResultUtil.runErr();
}
@@ -409,36 +411,34 @@
@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){
+ 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).eq(TStoreOther::getState,1));
- if(list.size()>0){
- tStoreOtherConfigTrues= tStoreOtherConfigTrueService.list(new LambdaQueryWrapper<TStoreOtherConfigTrue>().in(TStoreOtherConfigTrue::getPid, list.stream().map(TStoreOther::getId).collect(Collectors.toList())).eq(TStoreOtherConfigTrue::getState,1));
+ List<TStoreOther> list = tStoreOtherService.list(new LambdaQueryWrapper<TStoreOther>().eq(TStoreOther::getStoreId, id).eq(TStoreOther::getState, 1));
+ if (list.size() > 0) {
+ tStoreOtherConfigTrues = tStoreOtherConfigTrueService.list(new LambdaQueryWrapper<TStoreOtherConfigTrue>().in(TStoreOtherConfigTrue::getPid, list.stream().map(TStoreOther::getId).collect(Collectors.toList())).eq(TStoreOtherConfigTrue::getState, 1));
}
for (TStoreOtherConfigTrue tStoreOtherConfigTrue : tStoreOtherConfigTrues) {
for (TStoreOther tStoreOther : list) {
- if (tStoreOtherConfigTrue.getPid()==tStoreOther.getId()){
+ if (tStoreOtherConfigTrue.getPid() == tStoreOther.getId()) {
tStoreOtherConfigTrue.setSort(tStoreOther.getSort());
}
}
}
return ResultUtil.success(tStoreOtherConfigTrues);
- }catch (Exception e){
+ } catch (Exception e) {
e.printStackTrace();
return ResultUtil.runErr();
}
}
-
-
-
@ResponseBody
@@ -447,17 +447,15 @@
@ApiImplicitParams({
@ApiImplicitParam(value = "省编号", name = "pcode", dataType = "string", required = false),
})
- public ResultUtil<List<ProvinceAndCityVo>> queryProvinceAndCity(String pcode){
+ public ResultUtil<List<ProvinceAndCityVo>> queryProvinceAndCity(String pcode) {
try {
List<ProvinceAndCityVo> provinceAndCityVos = storeService.queryProvinceAndCity(pcode);
return ResultUtil.success(provinceAndCityVos);
- }catch (Exception e){
+ } catch (Exception e) {
e.printStackTrace();
return ResultUtil.runErr();
}
}
-
-
@ResponseBody
@@ -465,16 +463,15 @@
@ApiOperation(value = "获取所有开通城市", tags = {"APP-赛事活动列表", "用户—预约场地"})
@ApiImplicitParams({
})
- public ResultUtil<List<ProvinceAndCityVo>> queryAllCity(){
+ public ResultUtil<List<ProvinceAndCityVo>> queryAllCity() {
try {
List<ProvinceAndCityVo> provinceAndCityVos = storeService.queryAllCity();
return ResultUtil.success(provinceAndCityVos);
- }catch (Exception e){
+ } catch (Exception e) {
e.printStackTrace();
return ResultUtil.runErr();
}
}
-
@ResponseBody
@@ -483,11 +480,11 @@
@ApiImplicitParams({
@ApiImplicitParam(value = "城市code", name = "cityCode", dataType = "string", required = true),
})
- public ResultUtil<List<BaseVo>> queryStoreByCityCode(String provinceCode,String cityCode){
+ public ResultUtil<List<BaseVo>> queryStoreByCityCode(String provinceCode, String cityCode) {
try {
- List<BaseVo> list = storeService.queryStoreByCityCode(provinceCode,cityCode);
+ List<BaseVo> list = storeService.queryStoreByCityCode(provinceCode, cityCode);
return ResultUtil.success(list);
- }catch (Exception e){
+ } catch (Exception e) {
e.printStackTrace();
return ResultUtil.runErr();
}
--
Gitblit v1.7.1