From 04c2f47c8d0bcc59d4ef6e86a8754c0450206b43 Mon Sep 17 00:00:00 2001
From: xucong <850806214@qq.com>
Date: Mon, 12 Aug 2024 14:10:33 +0800
Subject: [PATCH] =?UTF-8?q?1.=E6=96=B0=E5=A2=9E=E4=BA=86=E6=9C=AC=E5=9C=B0?=
 =?UTF-8?q?=E7=94=9F=E6=B4=BB=E6=88=91=E7=9A=84=E8=AE=A2=E5=8D=95=202.?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BA=86=E6=88=91=E7=9A=84=E6=9C=AC=E5=9C=B0?=
 =?UTF-8?q?=E7=94=9F=E6=B4=BB=E5=95=86=E5=AE=B6=E5=88=A4=E6=96=AD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/api/logic/LocalStoreLogic.php | 2 +-
 app/api/logic/UserLogic.php       | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/api/logic/LocalStoreLogic.php b/app/api/logic/LocalStoreLogic.php
index 6ae6c44f..33b47cee 100644
--- a/app/api/logic/LocalStoreLogic.php
+++ b/app/api/logic/LocalStoreLogic.php
@@ -37,7 +37,7 @@ class LocalStoreLogic extends Logic
 //        var_dump($sql);
         $lists = Db::query($sql);
         foreach($lists as $key=>$value){
-            $lists[$key]['distance'] = round($this->distance($data['latitude'], $data['longitude'], $value['latitude'], $value['longitude'])/1000,1)."公里";
+            $lists[$key]['distance'] = round($this->distance($data['latitude'], $data['longitude'], $value['latitude'], $value['longitude'])/1000,2)."公里";
             $lists[$key]['store_nickname'] = $value["shopName"];
         }
         $data = [
diff --git a/app/api/logic/UserLogic.php b/app/api/logic/UserLogic.php
index 9b9aa950..aa0b7191 100755
--- a/app/api/logic/UserLogic.php
+++ b/app/api/logic/UserLogic.php
@@ -101,8 +101,8 @@ class UserLogic extends Logic
         // 获取集采信息
         $procurement = Mprocurement::where(['user_id' => $user_id, 'u_examine_state' => 1, 'u_state' => 1])->find();
         // 查询是否建立本地商家
-        $local = Db::name("local_store")->where("user_id",$user_id)->where("is_delete",0)->where("state",1)->select()->toArray();
-        if(empty($local)){
+        $local = Db::name("local_store")->where("user_id",$user_id)->where("is_delete",0)->where("store_state",1)->find();
+        if($local == null){
             $user['local'] = 0;
         }else{
             $user['local'] = 1;