diff --git a/nxhs-service/src/main/java/cc/yunxi/service/impl/IStationAreaServiceImpl.java b/nxhs-service/src/main/java/cc/yunxi/service/impl/IStationAreaServiceImpl.java index afa0597..80d4357 100644 --- a/nxhs-service/src/main/java/cc/yunxi/service/impl/IStationAreaServiceImpl.java +++ b/nxhs-service/src/main/java/cc/yunxi/service/impl/IStationAreaServiceImpl.java @@ -15,7 +15,6 @@ import java.math.BigDecimal; import java.util.List; /** - * * 商户经营区域 * 版本: V3.5 * 版权: 引迈信息技术有限公司(https://www.jnpfsoft.com) @@ -33,14 +32,14 @@ public class IStationAreaServiceImpl extends ServiceImpl wrapper = new QueryWrapper<>(); // wrapper.eq("area_type","1");//1接单 2不接单 - wrapper.eq("status","1");//0禁用 1启用 + wrapper.eq("status", "1");//0禁用 1启用 List areas = stationAreaMapper.selectList(wrapper); BigDecimal lat = new BigDecimal(location.getLatitude());//纬度 BigDecimal lng = new BigDecimal(location.getLongitude());//经度 for (StationArea area : areas) { String mapInfo = area.getAreaMapInfo(); - if(StringUtils.hasText(mapInfo)&& AreaUtil.isInsidePolygon(mapInfo, lng, lat)){ + if (StringUtils.hasText(mapInfo) && AreaUtil.isInsidePolygon(mapInfo, lat, lng)) { return area; } } diff --git a/nxhs-service/src/main/resources/mapper/RecycleStationMapper.xml b/nxhs-service/src/main/resources/mapper/RecycleStationMapper.xml index 865fd52..fbeccca 100644 --- a/nxhs-service/src/main/resources/mapper/RecycleStationMapper.xml +++ b/nxhs-service/src/main/resources/mapper/RecycleStationMapper.xml @@ -51,7 +51,7 @@ - //区域所属商户名下距离最近的回收站 +