加入商贸区逻辑：商品列表

app/common/repositories/system/merchant/MerchantRepository.php

@@ -413,7 +413,7 @@ class MerchantRepository extends BaseRepository
      * @param $userInfo
      * @return mixed
      */
-    public function productList($merId, $where, $page, $limit, $userInfo,$type439=false)
+    public function productList($merId, $where, $page, $limit, $userInfo,$type439=false,$is_commercetrade = 0)
     {
         log::info("========j进入prodctList");
         log::info($merId);
@@ -467,7 +467,7 @@ class MerchantRepository extends BaseRepository
                     ]
                 ];
 
-            }else if($merId == 439){
+            }else if($merId == 439 || $is_commercetrade){
                 //精彩生活和商贸区
                 $jf = $v['price'] - round($v['concession_pri']*0.3, 2) . ' + ' . round($v['concession_pri']*0.3, 2);
                 $jd = $v['price'] - round($v['concession_pri']*0.35, 2) . ' + ' . round($v['concession_pri']*0.35, 2);

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

@@ -98,6 +98,7 @@ class Merchant extends BaseController
         $domain = $this->request->domain();
         $id=0;
         $type439=true;
+        $is_commercetrade = 0;
         if($name=='dingsheng'){
             $id=486;
         }else if($name=='jingpin'){
@@ -114,6 +115,10 @@ class Merchant extends BaseController
             }
         }else if($name=='fugou'){
             $id=491;
+        }// 商贸区
+        else if($name=='commercetrade'){
+            $id=$this->merId;
+            $is_commercetrade = 1;
         }
         [$page, $limit] = $this->getPage();
         if($params['pageNum']!=''){
@@ -132,7 +137,7 @@ class Merchant extends BaseController
             $where['cate_id'] = $params['mer_cate_id'];
         }
 
-        return app('json')->success($this->repository->productList($id,$where, $page, $limit,$this->userInfo,$type439));
+        return app('json')->success($this->repository->productList($id,$where, $page, $limit,$this->userInfo,$type439,$is_commercetrade));
     }
 
     /**