增加商贸区接口

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

@@ -142,6 +142,53 @@ class Merchant extends BaseController
     }
 
     /**
+     * 商贸区店铺商品列表
+     * @return mixed
+     * @throws \think\db\exception\DataNotFoundException
+     * @throws \think\db\exception\DbException
+     * @throws \think\db\exception\ModelNotFoundException
+     */
+    public function commerceProductList()
+    {
+        $params= $this->request->params(['pageNum','pageSize']);
+        $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'];
+        }
+        $mer_list = Db::name('merchant')->where(['category_id' => 32,'status' => 1,'is_del' => 0])->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'];
+                $return_list[] = $mer;
+            }
+        }
+        return app('json')->success(['list'=>$return_list]);
+
+    }
+
+    /**
      * 查询代理人商品
      * @param $type
      * @return mixed

route/api.php

@@ -730,6 +730,7 @@ Route::group('api/', function () {
             Route::get('listindex', 'Merchant/listindex');
             Route::get('/product/lst/:id', 'Merchant/productList');
             Route::get('/product/type_lst', 'Merchant/productTypeList');//特殊-根据商户查询商品
+            Route::get('/product/commerce_list', 'Merchant/commerceProductList');//特殊-根据商户查询商品
             Route::get('/areaProduct/lst', 'Merchant/areaProductList');
             Route::get('/category/lst/:id', 'Merchant/categoryList');
             Route::get('/detail/:id', 'Merchant/detail');