From c743f4413a00fc063bbbd9d851b6d0c3fff10581 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期一, 31 七月 2023 10:04:02 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
cloud-server-other/src/main/java/com/dsh/other/service/impl/StoreServiceImpl.java | 47 ++++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 46 insertions(+), 1 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 ec71bcf..a450214 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
@@ -6,6 +6,7 @@
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.service.StoreService;
import com.dsh.other.util.GDMapGeocodingUtil;
import com.dsh.other.util.ToolUtil;
@@ -62,8 +63,11 @@
*/
@Override
public List<BaseVo> queryStoreLists(String lon, String lat) throws Exception {
- Map<String, String> geocode = gdMapGeocodingUtil.geocode(lon, lat);
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");
@@ -76,4 +80,45 @@
}
return list;
}
+
+
+ /**
+ * 获取开通省市
+ * @param pcode
+ * @return
+ * @throws Exception
+ */
+ @Override
+ public List<ProvinceAndCityVo> queryProvinceAndCity(String pcode) throws Exception {
+ if(ToolUtil.isEmpty(pcode)){
+ return this.baseMapper.queryProvince();
+ }
+ if(ToolUtil.isNotEmpty(pcode)){
+ return this.baseMapper.queryCity(pcode);
+ }
+ return null;
+ }
+
+
+ /**
+ * 获取所有开通城市
+ * @return
+ * @throws Exception
+ */
+ @Override
+ public List<ProvinceAndCityVo> queryAllCity() throws Exception {
+ return this.baseMapper.queryCity(null);
+ }
+
+
+ /**
+ * 根据城市code获取城市列表
+ * @param cityCode
+ * @return
+ * @throws Exception
+ */
+ @Override
+ public List<BaseVo> queryStoreByCityCode(String cityCode) throws Exception {
+ return this.baseMapper.queryStoreByCityCode(cityCode);
+ }
}
--
Gitblit v1.7.1