From acad524bfb7f376c09ff8e6600fab207780156e1 Mon Sep 17 00:00:00 2001
From: 44323 <443237572@qq.com>
Date: 星期四, 23 十一月 2023 18:46:05 +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/service/impl/StoreServiceImpl.java | 49 +++++++++++++++++++++++++++++++++++++++++--------
1 files changed, 41 insertions(+), 8 deletions(-)
diff --git a/cloud-server-other/src/main/java/com/dsh/other/service/impl/StoreServiceImpl.java b/cloud-server-other/src/main/java/com/dsh/other/service/impl/StoreServiceImpl.java
index d19338e..eba9dd1 100644
--- a/cloud-server-other/src/main/java/com/dsh/other/service/impl/StoreServiceImpl.java
+++ b/cloud-server-other/src/main/java/com/dsh/other/service/impl/StoreServiceImpl.java
@@ -3,10 +3,12 @@
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.dsh.other.entity.OperatorUser;
import com.dsh.other.entity.Store;
import com.dsh.other.mapper.StoreMapper;
import com.dsh.other.model.BaseVo;
import com.dsh.other.model.ProvinceAndCityVo;
+import com.dsh.other.model.dto.siteDto.StoreInfoDto;
import com.dsh.other.service.StoreService;
import com.dsh.other.util.GDMapGeocodingUtil;
import com.dsh.other.util.ToolUtil;
@@ -54,6 +56,27 @@
return storeMapper.getStoreByStoreStaffId(id);
}
+ @Override
+ public String getOName(Integer operatorId) {
+
+ return this.baseMapper.getOName(operatorId);
+ }
+
+ @Override
+ public List<Map<String, Object>> game(Integer appUserId) {
+ return this.baseMapper.game(appUserId);
+ }
+
+ @Override
+ public OperatorUser queryByStoreId(Integer id) {
+ return this.baseMapper.queryByStoreId(id);
+ }
+
+ @Override
+ public StoreInfoDto getStoreInfo(Integer id) {
+ return this.baseMapper.getStoreInfo(id);
+ }
+
/**
* 获取列表数据
@@ -84,20 +107,30 @@
* @throws Exception
*/
@Override
- public List<BaseVo> queryStoreLists(String lon, String lat) throws Exception {
+ public List<BaseVo> queryStoreLists(String lon, String lat,String cityCode) throws Exception {
List<BaseVo> list = new ArrayList<>();
if(ToolUtil.isEmpty(lon) || ToolUtil.isEmpty(lat)){
return list;
}
- Map<String, String> geocode = gdMapGeocodingUtil.geocode(lon, lat);
- if(null != geocode){
- String provinceCode = geocode.get("provinceCode");
- String cityCode = geocode.get("cityCode");
- List<Store> stores = this.queryStorsList(provinceCode, cityCode);
+ if(ToolUtil.isNotEmpty(cityCode)){
+ List<Store> stores = this.queryStorsList(null, cityCode);
for (Store store : stores) {
BaseVo baseVo = new BaseVo();
BeanUtils.copyProperties(store, baseVo);
list.add(baseVo);
+ }
+ }else {
+ Map<String, String> geocode = gdMapGeocodingUtil.geocode(lon, lat);
+ if(null != geocode){
+ String provinceCode = geocode.get("provinceCode");
+ String cityCode1 = geocode.get("cityCode");
+
+ List<Store> stores = this.queryStorsList(provinceCode, cityCode1);
+ for (Store store : stores) {
+ BaseVo baseVo = new BaseVo();
+ BeanUtils.copyProperties(store, baseVo);
+ list.add(baseVo);
+ }
}
}
return list;
@@ -140,8 +173,8 @@
* @throws Exception
*/
@Override
- public List<BaseVo> queryStoreByCityCode(String cityCode) throws Exception {
- return this.baseMapper.queryStoreByCityCode(cityCode);
+ public List<BaseVo> queryStoreByCityCode(String provinceCode,String cityCode) throws Exception {
+ return this.baseMapper.queryStoreByCityCode(provinceCode,cityCode);
}
--
Gitblit v1.7.1