From 88998e2432d774f58b47da5efd652a3701c51558 Mon Sep 17 00:00:00 2001
From: guochaojie <guochaojie_1995@163.com>
Date: Fri, 24 May 2024 16:21:13 +0800
Subject: [PATCH] =?UTF-8?q?=E7=94=B5=E5=AD=90=E5=9B=B4=E6=A0=8F=E4=BC=98?=
 =?UTF-8?q?=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/cc/yunxi/service/impl/IStationAreaServiceImpl.java  | 5 ++---
 .../src/main/resources/mapper/RecycleStationMapper.xml       | 4 ++--
 2 files changed, 4 insertions(+), 5 deletions(-)

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<StationAreaMapper, Stat
         //获取所有的围栏信息
         QueryWrapper<StationArea> wrapper = new QueryWrapper<>();
 //        wrapper.eq("area_type","1");//1接单 2不接单
-        wrapper.eq("status","1");//0禁用 1启用
+        wrapper.eq("status", "1");//0禁用 1启用
         List<StationArea> 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 @@
     </select>
 
 
-    //区域所属商户名下距离最近的回收站
+<!--    区域所属商户名下距离最近的回收站-->
     <select id="getNearbyInArea" resultType="RecycleStation">
         SELECT a.*,
                ROUND(
@@ -59,7 +59,7 @@
                                SQRT(
                                            POW(SIN((#{position.latitude} - latitude) * PI() / 360), 2) +
                                            COS(#{position.latitude} * PI() / 180) * COS(latitude * PI() / 180) *
-                                           POW(SIN((#{postion.longitude} - longitude) * PI() / 360), 2))) * 1000
+                                           POW(SIN((#{position.longitude} - longitude) * PI() / 360), 2))) * 1000
                    ) AS distance
         FROM nx_enterprise_recycle_station a
         WHERE a.latitude IS NOT NULL