小程序app-商贸区-检测问题

app/controller/api/store/merchant/Merchant.php

@@ -233,25 +233,26 @@ class Merchant extends BaseController
             $query->whereIn('mer_id', $hasProductMerIdList);
         }
         $mer_list = $query->page($page)->limit($limit)->select();
-        $where['is_gift_bag'] = 0;
-        $where['is_used'] = 1;
-        $where['product_type'] = 0;
-        $where['is_hide'] = 0;
-        $return_list = [];
-        if($mer_list) {
-            $mer_list = $mer_list->toArray();
-            foreach ($mer_list as $mer) {
-                if(in_array($mer['mer_id'],$mer_id_unset)) continue;
-                $goods = $this->repository->productList($mer['mer_id'],$where, 1, 3,$this->userInfo,false,$is_commercetrade);
-                if(empty($goods['list'])) continue;
-                $mer['goods_list'] = $goods['list'];
-                if (mb_strlen($mer['mer_name']) > 8) {
-                    $mer['mer_name'] = mb_substr($mer['mer_name'], 0, 8) . '...';
-                }
-                $return_list[] = $mer;
-            }
-        }
-        return app('json')->success(['list'=>$return_list]);
+        return app('json')->success(['list'=>$mer_list]);
+//        $where['is_gift_bag'] = 0;
+//        $where['is_used'] = 1;
+//        $where['product_type'] = 0;
+//        $where['is_hide'] = 0;
+//        $return_list = [];
+//        if($mer_list) {
+//            $mer_list = $mer_list->toArray();
+//            foreach ($mer_list as $mer) {
+//                if(in_array($mer['mer_id'],$mer_id_unset)) continue;
+//                $goods = $this->repository->productList($mer['mer_id'],$where, 1, 3,$this->userInfo,false,$is_commercetrade);
+//                if(empty($goods['list'])) continue;
+//                $mer['goods_list'] = $goods['list'];
+//                if (mb_strlen($mer['mer_name']) > 8) {
+//                    $mer['mer_name'] = mb_substr($mer['mer_name'], 0, 8) . '...';
+//                }
+//                $return_list[] = $mer;
+//            }
+//        }
+//        return app('json')->success(['list'=>$return_list]);
 
     }