Merge branch 'phoenix' of http://120.24.33.109:11081/hyzjshwo/lanzu_api_hyperf into phoenix

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('is_default',1)
+            // ->orderByDesc('is_default')
+            // ->orderByDesc('updated_at')
             ->first();
         $res['location'] = [
             'address' => $address,
@@ -156,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]);

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()
     {