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

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

@@ -195,38 +195,37 @@ class Merchant extends BaseController
      */
     public function commerceProductList()
     {
-        $hajimi = Db::name('merchant')->where('mer_id',3478)->find();
-        return app('json')->success($hajimi);
-//        $params= $this->request->params(['pageNum','pageSize','category_id']);
-//        $mer_id_unset = [496,486,439,148,491];
-//        $domain = $this->request->domain();
-//        if(strpos($domain, 'test.hebeiyhc.com') !== false) {
-//            // 域名中包含 "test.hebeiyhc.com'" 字符串
-//            array_push($mer_id_unset, 486);
-//        }else{
-//            array_push($mer_id_unset, 497);
-//        }
-//
-//        $is_commercetrade = 1;
-//        [$page, $limit] = $this->getPage();
-//        if($params['pageNum']!=''){
-//            $page=$params['pageNum'];
-//        }
-//        if($params['pageSize']!=''){
-//            $limit=$params['pageSize'];
-//        }
-//        $category_id = $params['category_id']?:0;
-//        $where['is_del'] = 0;
-//        $where['status'] = 1;
-//        $category_id && $where['category_id'] = $category_id;
-//
-//        $hasProductMerIdList = Db::name('store_product')
-//            ->where('status', '=', 1)
-//            ->where('is_show', '=', 1)
-//            ->where('is_del', '=', 0)
-//            ->group('mer_id')
-//            ->field('mer_id')
-//            ->select();
+        $params= $this->request->params(['pageNum','pageSize','category_id']);
+        $mer_id_unset = [496,486,439,148,491];
+        $domain = $this->request->domain();
+        if(strpos($domain, 'test.hebeiyhc.com') !== false) {
+            // 域名中包含 "test.hebeiyhc.com'" 字符串
+            array_push($mer_id_unset, 486);
+        }else{
+            array_push($mer_id_unset, 497);
+        }
+
+        $is_commercetrade = 1;
+        [$page, $limit] = $this->getPage();
+        if($params['pageNum']!=''){
+            $page=$params['pageNum'];
+        }
+        if($params['pageSize']!=''){
+            $limit=$params['pageSize'];
+        }
+        $category_id = $params['category_id']?:0;
+        $where['is_del'] = 0;
+        $where['status'] = 1;
+        $category_id && $where['category_id'] = $category_id;
+
+        $hasProductMerIdList = Db::name('store_product')
+            ->where('status', '=', 1)
+            ->where('is_show', '=', 1)
+            ->where('is_del', '=', 0)
+            ->group('mer_id')
+            ->field('mer_id')
+            ->select();
+        return app('json')->success($hasProductMerIdList);
 //        if ($hasProductMerIdList) {
 //            $hasProductMerIdList = array_column($hasProductMerIdList->toArray(), 'mer_id');
 //        }
@@ -235,7 +234,26 @@ class Merchant extends BaseController
 //            $query->whereIn('mer_id', $hasProductMerIdList);
 //        }
 //        $mer_list = $query->page($page)->limit($limit)->select();
-//        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]);
+
     }
 
     /**