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

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

@@ -225,20 +225,20 @@ class Merchant extends BaseController
             ->group('mer_id')
             ->field('mer_id')
             ->select();
-        return app('json')->success($hasProductMerIdList);
-//        if ($hasProductMerIdList) {
-//            $hasProductMerIdList = array_column($hasProductMerIdList->toArray(), 'mer_id');
-//        }
-//        $query = Db::name('merchant')->where($where);
-//        if (!empty($hasProductMerIdList) && is_array($hasProductMerIdList)) {
-//            $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 ($hasProductMerIdList) {
+            $hasProductMerIdList = array_column($hasProductMerIdList->toArray(), 'mer_id');
+        }
+        $query = Db::name('merchant')->where($where);
+        if (!empty($hasProductMerIdList) && is_array($hasProductMerIdList)) {
+            $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 = [];
+        return app('json')->success(['list'=>$mer_list]);
 //        if($mer_list) {
 //            $mer_list = $mer_list->toArray();
 //            foreach ($mer_list as $mer) {