From 5ea36cb545324e4853fd8f0059d743aac7b9b43a Mon Sep 17 00:00:00 2001
From: Lemon <15040771@qq.com>
Date: Wed, 16 Sep 2020 17:52:52 +0800
Subject: [PATCH] =?UTF-8?q?=E5=95=86=E5=AE=B6=E7=99=BB=E5=BD=95=20?=
 =?UTF-8?q?=E5=A4=B1=E6=95=88=E6=A0=A1=E9=AA=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/Service/v3/Implementations/StoreLoginService.php  | 8 +++++++-
 app/Service/v3/Implementations/UserAddressService.php | 1 +
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/app/Service/v3/Implementations/StoreLoginService.php b/app/Service/v3/Implementations/StoreLoginService.php
index abbed09..0aa7e4e 100644
--- a/app/Service/v3/Implementations/StoreLoginService.php
+++ b/app/Service/v3/Implementations/StoreLoginService.php
@@ -11,7 +11,13 @@ class StoreLoginService implements StoreLoginServiceInterface
 {
     public function do($account,$password)
     {
-        $storeUsersModel = StoreUsers::query()->where('username',$account)->first();
+        $storeUsersModel = StoreUsers::query()->where([
+            ['username','=',$account],
+            ['status','=',2]
+        ])->first();
+        if(empty($storeUsersModel)){
+            throw new ErrorCodeException(ErrorCode::STORE_NOT_AVAILABLE);
+        }
         $password = $this->stringHash($password,$storeUsersModel->salt);
         if($storeUsersModel->password === $password){
             return $storeUsersModel;
diff --git a/app/Service/v3/Implementations/UserAddressService.php b/app/Service/v3/Implementations/UserAddressService.php
index ed5cadc..ebfc46f 100644
--- a/app/Service/v3/Implementations/UserAddressService.php
+++ b/app/Service/v3/Implementations/UserAddressService.php
@@ -87,6 +87,7 @@ class UserAddressService implements UserAddressServiceInterface
         $market = Market::query()->select('lng','lat')->find($marketId);
         $distance = $this->locationService->getDistanceByTencent($address['address']->lng,$address['address']->lat,$market->lng,$market->lat);
         $distributionPrice = $this->distributionPriceService->do($distance);
+        var_dump($distance);
         $res['address'] = $address;
         $res['delivery_distance'] = $distance;
         $res['distribution_price'] = $distributionPrice;