From 3c79213e9dd52276c68013582e752118ddd63015 Mon Sep 17 00:00:00 2001
From: weigang <mr.shuixiang@aliyun.com>
Date: Wed, 16 Sep 2020 19:07:08 +0800
Subject: [PATCH 1/3] =?UTF-8?q?=E9=BB=98=E8=AE=A4=E5=9C=B0=E5=9D=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/Controller/v3/OrderOnlineController.php | 8 +++++---
 app/Model/v3/Store.php                      | 8 ++++----
 2 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/app/Controller/v3/OrderOnlineController.php b/app/Controller/v3/OrderOnlineController.php
index c0ffffe..07b2de9 100644
--- a/app/Controller/v3/OrderOnlineController.php
+++ b/app/Controller/v3/OrderOnlineController.php
@@ -88,9 +88,11 @@ class OrderOnlineController extends BaseController
             throw new ErrorCodeException(ErrorCode::NOT_BIND_TEL_ERROR);
         }
         //获取用户收货地址
-        $address = UserAddress::query()->where('user_id',$userId)
-            ->orderByDesc('is_default')
-            ->orderByDesc('updated_at')
+        $address = UserAddress::query()
+            ->where('user_id',$userId)
+            ->where('id_default',1)
+            // ->orderByDesc('is_default')
+            // ->orderByDesc('updated_at')
             ->first();
         $res['location'] = [
             'address' => $address,
diff --git a/app/Model/v3/Store.php b/app/Model/v3/Store.php
index a4e3df4..830c019 100644
--- a/app/Model/v3/Store.php
+++ b/app/Model/v3/Store.php
@@ -72,10 +72,10 @@ class Store extends Model
         return (integer)$ssdb->exec('get', SsdbKeys::STORE_MONTH_SALES.date('Ym').'_'.$this->id);
     }
 
-    // public function getLogoAttribute($value)
-    // {
-    //     return $this->attachmentService->switchImgToAliOss($value, OssThumbnail::THUMBNAIL_300_Q80);
-    // }
+    public function getLogoAttribute($value)
+    {
+        return $this->attachmentService->switchImgToAliOss($value, OssThumbnail::THUMBNAIL_300_Q80);
+    }
 
     public function goods()
     {

From f68ede024c67aaef3b6fad77069e41adad1588a4 Mon Sep 17 00:00:00 2001
From: weigang <mr.shuixiang@aliyun.com>
Date: Wed, 16 Sep 2020 19:10:34 +0800
Subject: [PATCH 2/3] =?UTF-8?q?=E4=B8=8B=E5=8D=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/Controller/v3/OrderOnlineController.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/Controller/v3/OrderOnlineController.php b/app/Controller/v3/OrderOnlineController.php
index 07b2de9..3eb2fd2 100644
--- a/app/Controller/v3/OrderOnlineController.php
+++ b/app/Controller/v3/OrderOnlineController.php
@@ -158,9 +158,9 @@ class OrderOnlineController extends BaseController
             json_decode($params['store_list']),
             $params['total_money'],
             $params['delivery_time_note'],
-            $params['service_money'],
+            ($params['service_money'] ?: 0),
             $couponIds,
-            $params['plat']
+            $params['plat'] ?: ''
         );
 
         return $this->success(['data' => $data]);

From f6c9e9a3be0ad02a88476e6368fd9e00ba3a9a47 Mon Sep 17 00:00:00 2001
From: weigang <mr.shuixiang@aliyun.com>
Date: Wed, 16 Sep 2020 19:13:56 +0800
Subject: [PATCH 3/3] =?UTF-8?q?=E9=BB=98=E8=AE=A4=E6=94=B6=E8=B4=A7?=
 =?UTF-8?q?=E5=9C=B0=E5=9D=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/Controller/v3/OrderOnlineController.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/Controller/v3/OrderOnlineController.php b/app/Controller/v3/OrderOnlineController.php
index 3eb2fd2..0f578f0 100644
--- a/app/Controller/v3/OrderOnlineController.php
+++ b/app/Controller/v3/OrderOnlineController.php
@@ -90,7 +90,7 @@ class OrderOnlineController extends BaseController
         //获取用户收货地址
         $address = UserAddress::query()
             ->where('user_id',$userId)
-            ->where('id_default',1)
+            ->where('is_default',1)
             // ->orderByDesc('is_default')
             // ->orderByDesc('updated_at')
             ->first();