From 53e7558400dcacecdce70e39ebfe1727740f9296 Mon Sep 17 00:00:00 2001 From: puzhibing <393733352@qq.com> Date: 星期六, 25 十一月 2023 17:20:06 +0800 Subject: [PATCH] 重写课包支付和排课逻辑 --- cloud-server-other/src/main/java/com/dsh/other/service/impl/StoreServiceImpl.java | 32 ++++++++++++++++++++------------ 1 files changed, 20 insertions(+), 12 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 eba9dd1..7352655 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 @@ -29,7 +29,7 @@ * @since 2023-06-14 */ @Service -public class StoreServiceImpl extends ServiceImpl<StoreMapper,Store> implements StoreService { +public class StoreServiceImpl extends ServiceImpl<StoreMapper, Store> implements StoreService { @Autowired private StoreMapper storeMapper; @@ -39,6 +39,7 @@ /** * 根据城市管理员id获取门店集合 + * * @param id * @return */ @@ -46,8 +47,10 @@ public List<Store> getStoreByCityManagerId(Integer id) { return storeMapper.getStoreByCityManagerId(id); } + /** * 根据门店员工id获取门店集合 + * * @param id * @return */ @@ -80,6 +83,7 @@ /** * 获取列表数据 + * * @param provinceCode * @param cityCode * @return @@ -88,10 +92,10 @@ @Override public List<Store> queryStorsList(String provinceCode, String cityCode) throws Exception { QueryWrapper objectQueryWrapper = new QueryWrapper<Store>().eq("state", 1); - if(ToolUtil.isNotEmpty(provinceCode)){ + if (ToolUtil.isNotEmpty(provinceCode)) { objectQueryWrapper.eq("provinceCode", provinceCode); } - if(ToolUtil.isNotEmpty(cityCode)){ + if (ToolUtil.isNotEmpty(cityCode)) { objectQueryWrapper.eq("cityCode", cityCode); } List<Store> list = this.list(objectQueryWrapper); @@ -101,27 +105,28 @@ /** * 获取列表数据 + * * @param lon * @param lat * @return * @throws Exception */ @Override - public List<BaseVo> queryStoreLists(String lon, String lat,String cityCode) 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)){ + if (ToolUtil.isEmpty(lon) || ToolUtil.isEmpty(lat)) { return list; } - if(ToolUtil.isNotEmpty(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 { + } else { Map<String, String> geocode = gdMapGeocodingUtil.geocode(lon, lat); - if(null != geocode){ + if (null != geocode) { String provinceCode = geocode.get("provinceCode"); String cityCode1 = geocode.get("cityCode"); @@ -139,16 +144,17 @@ /** * 获取开通省市 + * * @param pcode * @return * @throws Exception */ @Override public List<ProvinceAndCityVo> queryProvinceAndCity(String pcode) throws Exception { - if(ToolUtil.isEmpty(pcode)){ + if (ToolUtil.isEmpty(pcode)) { return this.baseMapper.queryProvince(); } - if(ToolUtil.isNotEmpty(pcode)){ + if (ToolUtil.isNotEmpty(pcode)) { return this.baseMapper.queryCity(pcode); } return null; @@ -157,6 +163,7 @@ /** * 获取所有开通城市 + * * @return * @throws Exception */ @@ -168,13 +175,14 @@ /** * 根据城市code获取城市列表 + * * @param cityCode * @return * @throws Exception */ @Override - public List<BaseVo> queryStoreByCityCode(String provinceCode,String cityCode) throws Exception { - return this.baseMapper.queryStoreByCityCode(provinceCode,cityCode); + public List<BaseVo> queryStoreByCityCode(String provinceCode, String cityCode) throws Exception { + return this.baseMapper.queryStoreByCityCode(provinceCode, cityCode); } -- Gitblit v1.7.1