wesmiler 3 주 전
부모
커밋
65b6116c8d
3개의 변경된 파일4개의 추가작업 그리고 3개의 파일을 삭제
  1. 2 1
      app/Http/Controllers/Api/v1/OrderController.php
  2. 1 1
      app/Services/Api/ArticleService.php
  3. 1 1
      app/Services/Common/GoodsService.php

+ 2 - 1
app/Http/Controllers/Api/v1/OrderController.php

@@ -26,7 +26,8 @@ class OrderController extends webApp
     {
         $params = request()->post();
         $pageSize = request()->post('pageSize', 15);
-        $params['user_id'] = $this->userId;
+        $uid = isset($params['uid'])?$params['uid']:0;
+        $params['user_id'] = $uid?$uid:$this->userId;
         $datas = OrderService::make()->getDataList($params, $pageSize);
 
         return message(1010, true, $datas);

+ 1 - 1
app/Services/Api/ArticleService.php

@@ -145,7 +145,7 @@ class ArticleService extends BaseService
                 // 协议
                 $showType = isset($params['show_type'])? $params['show_type'] : 0;
                 if($showType == 3){
-                    $query->where('a.type','>=',3)->whereNotIn('a.type',[9,10]);
+                    $query->where('a.type','>=',3)->whereNotIn('a.type',[8,9,10]);
                 }
 
             });

+ 1 - 1
app/Services/Common/GoodsService.php

@@ -158,7 +158,7 @@ class GoodsService extends BaseService
             $storeName = isset($params['store_name']) ? trim($params['store_name']) : '';
             if ($storeName) {
                 $query->whereHas('store', function ($q) use ($storeName) {
-                    $q->where('name', 'like', "%{$storeName}%");
+                    $q->where('nickname', 'like', "%{$storeName}%")->orWhere('mobile', 'like', "%{$storeName}%");
                 });
             }
         });