客户端-增加获取商户上架的商品列表接口

app/common/dao/store/product/ProductDao.php

@@ -121,20 +121,9 @@ class ProductDao extends BaseDao
         $query -> where("type != 7");
         $query->withSearch($keyArray, $whereArr);
 
-        if($mer_type==1 && $merId==324){
-            $merIds=Db::name('merchant')->where('mer_type',1)->column('mer_id');
-            //一壶茶会员专区
-            $query->when($merIds, function ($query) use ($merIds) {
-                $query->whereIn('mer_id', $merIds);
-            });
-        }else{
-            $query->when(($merId !== null), function ($query) use ($merId) {
-                $query->where('mer_id', $merId);
-            });
-        }
-
-
-        $query->when(isset($where['hot_type']) && $where['hot_type'] !== '', function ($query) use ($where) {
+        $query->when(!empty($merId), function ($query) use ($merId) {
+            $query->where('mer_id', $merId);
+        })->when(isset($where['hot_type']) && $where['hot_type'] !== '', function ($query) use ($where) {
             if ($where['hot_type'] == 'new')
                 $query->where('is_new', 1);
             else if ($where['hot_type'] == 'hot')
@@ -162,16 +151,7 @@ class ProductDao extends BaseDao
             unset($where['keyword']);
         })->when(isset($where['volunteer']),function ($query) use ($where){
             $query-> where('volunteer',$where['volunteer']);
-        });
-        $source = request()->header('source');
-        $merId= request()->header('merId');
-        if($source=='yhc' && $merId){
-//            $query->where('spu_id = "" || spu_id is null');
-//            $query->where('type',17);
-            $query->where('is_good',1);
-        }
-
-        $query->when(isset($where['order']),function($query)use($where){
+        })->when(isset($where['order']),function($query)use($where){
             $query->when(in_array($where['order'], ['is_new', 'price_asc', 'price_desc', 'rate', 'sales', 'create_time']), function ($query) use ($where) {
                 if ($where['order'] == 'price_asc') {
                     $where['order'] = 'price ASC';

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

@@ -425,6 +425,7 @@ class MerchantRepository extends BaseRepository
         $arr=[];
         foreach ($list["list"] as $v){
             $k= app()->make(ProductRepository::class)->pvParm($v['product_id']);
+            $productMerId = $v['mer_id'] ?? 0;
 //            $v['special_merchant']= merchantConfig($v['mer_id'], 'special_merchant');
 
             log::info("==========yang= {$k['yanglao']} ");
@@ -453,7 +454,7 @@ class MerchantRepository extends BaseRepository
                 $num_yl = 8000;
             }
 
-            if($merId == 496){
+            if($productMerId == 496){
 
                 $v['yanglao'] = bcmul($num_yl, 0.035, 2);
                 $v['pv'] = bcmul($num_yl, 0.7, 2);
@@ -467,7 +468,7 @@ class MerchantRepository extends BaseRepository
                     ]
                 ];
 
-            }else if($merId == 439 || $is_commercetrade){
+            }else if($productMerId == 439 || $is_commercetrade){
                 //精彩生活和商贸区
                 $jf = $v['price'] - bcmul($v['concession_pri'],0.3, 2) . ' + ' . bcmul($v['concession_pri'],0.3, 2);
                 $jd = $v['price'] - bcmul($v['concession_pri'],0.35, 2) . ' + ' . bcmul($v['concession_pri'],0.35, 2);
@@ -479,7 +480,7 @@ class MerchantRepository extends BaseRepository
                     $v['jifen'] = bcmul($v['concession_pri'], 0.35, 2);
                     $v['gongxian'] = bcmul($v['concession_pri'], 0.35, 2);
                 }
-            }else if($merId == 491){
+            }else if($productMerId == 491){
                 // 获取商品sku
                 $productSku = Db::name('store_product_attr_value')->where('product_id', $v['product_id'])->order('price asc')->find();
                 $pv = $productSku['plate_mer_profit']??0.00;

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

@@ -142,6 +142,50 @@ class Merchant extends BaseController
     }
 
     /**
+     * 获取商户上架的商品列表
+     * @return mixed
+     */
+    public function getProductList()
+    {
+        $params = request()->only(['pageNum', 'pageSize', 'mer_id']);
+        $merId = $params['mer_id'] ?? 0;
+
+        [$page, $limit] = $this->getPage();
+        $where = request()->only(['keyword']);
+        $where['is_gift_bag'] = 0;
+        $where['is_used'] = 1;
+        $where['product_type'] = 0;
+        $where['is_hide'] = 0;
+        $result = $this->repository->productList($merId, $where, $page, $limit, $this->userInfo);
+        $formatList = [];
+        foreach ($result['list'] as $productInfo) {
+            $formatList[] = [
+                'type' => 0,//京东商品
+                'skuId' => '',//itemId 京东官方 已不返回skuId , 使用 联盟商品ID 代替skuId
+                'id' => $productInfo['product_id'] ?? '', //id
+                'name' => $productInfo['store_name'],//名称
+                'thumb' => $productInfo['image'] ?? '',//商品缩略图
+
+                'pv' => $productInfo['pv'],//PV金额
+                'gongxian' => $productInfo['gongxian'],
+                'jifen' => $productInfo['jifen'],
+                'yanglaojin' => $productInfo['yanglao'],
+
+                'commission' => $productInfo['concession_pri'],//佣金
+                'commission_rate' => null,//佣金比例
+                'coupon_money' => [],
+                'coupon_link' => '',
+                'lowestCouponPrice' => $productInfo['price'],
+                'price' => $productInfo['ot_price'], //价格
+                'imageList' => $productInfo['slider_image'], //图片合集
+                'materialUrl' => ''
+            ];
+        }
+        return app('json')->success(['count' => $result['count'], 'list' => $formatList, 'merId' => $merId]);
+    }
+
+
+    /**
      * 商贸区店铺商品列表
      * @return mixed
      * @throws \think\db\exception\DataNotFoundException

route/api.php

@@ -725,6 +725,7 @@ Route::group('api/', function () {
             //店铺列表
             Route::get('listindex', 'Merchant/listindex');
             Route::get('/product/lst/:id', 'Merchant/productList');
+            Route::get('/product/getProductList', 'Merchant/getProductList');
             Route::get('/product/type_lst', 'Merchant/productTypeList');//特殊-根据商户查询商品
             Route::get('/product/commerce_list', 'Merchant/commerceProductList');//特殊-根据商户查询商品
             Route::get('/areaProduct/lst', 'Merchant/areaProductList');