Merge remote-tracking branch 'origin/master'

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

@@ -120,14 +120,14 @@ class Merchant extends BaseController
         if($params['pageSize']!=''){
             $limit=$params['pageSize'];
         }
-        $where = $this->request->params(['keyword','order','mer_cate_id','price_on', 'price_off','brand_id']);
+        $where = $this->request->params(['keyword','order','mer_cate_id', 'cate_id','price_on', 'price_off','brand_id']);
         $where['is_gift_bag'] = 0;
         $where['is_used'] = 1;
         $where['product_type'] = 0;
         $where['is_hide'] = 0;
         log::info("====={$params['mer_cate_id']}===");
         if($params['mer_cate_id']){
-            $where['cate_id'] =$params['mer_cate_id'];
+            $where['cate_id'] = $params['mer_cate_id'];
         }
 
         return app('json')->success($this->repository->productList($id,$where, $page, $limit,$this->userInfo,$type439));

app/controller/api/store/product/DaTaoKe.php

@@ -574,6 +574,28 @@ class DaTaoKe
         return ['code' => 1, 'data' => $goodsList, 'raw' => $pddGoodsList];
     }
 
+
+
+    //拼多多商品搜索_第三方大淘客
+    public static function pddCatList($parentId = 0)
+    {
+        $queryData = [
+            'appKey' => self::$appKey,
+            'version' => 'v2.0.0',
+            'parentId' => $parentId,
+        ];
+        $url = 'https://openapi.dataoke.com/api/dels/pdd/category/search';
+        $queryData['sign'] = self::makeSign($queryData, self::$appSecret);
+        $fullUrl = "{$url}?" . http_build_query($queryData);
+        $response = self::sendCurl($fullUrl);
+        if ($response['code'] != 0)//运行出错
+            return ['code' => 0, 'data' => $response];
+       
+        return ['code' => 1, 'data' => $response];
+    }
+
+
+
     // 拼多多定时获取列表
     public function pdd_cron()
     {

app/controller/api/store/product/Su.php

@@ -400,7 +400,8 @@ class Su extends BaseController
         $_cid = $this->request->param('cid');
         // dd($_cid);
         $userId = $this->request->uid();
-        TaoKe::set_third_history($userId,$keyword['keyword']);
+        TaoKe::set_third_history($userId,$keyword);
+        
 
         $goods_obj = Db::name('third_party_goods')
             ->where('type', 4);

app/controller/api/store/product/TaoKe.php

@@ -130,6 +130,7 @@ class TaoKe extends BaseController
     public function pdd_list()
     {
         $keyword=input('keyword','');
+        $cat_id = input('cat_id','');
         $token = trim($this->request->header('X-Token'));
 
 
@@ -177,6 +178,8 @@ class TaoKe extends BaseController
             return app('json')->success('未查询到商品', []);
         }
 
+        $params['cat_id'] = $cat_id;
+
         Log::info($params);
 
         $apiName = 'pdd.ddk.goods.search';
@@ -252,7 +255,8 @@ class TaoKe extends BaseController
                     'price' => set_price_rtrim(sprintf('%.2f', $groupPrice - $couponMoney)),
     
                     'shopName'=>$goods['mall_name'], //店铺名称
-                    'monthSales'=>$goods['sales_tip']>0?$goods['sales_tip']:mt_rand(100,10000) //月销量
+                    'monthSales'=>$goods['sales_tip']>0?$goods['sales_tip']:mt_rand(100,10000), //月销量
+                    'cat_ids'=>$goods['cat_ids']
                 ];
                 Log::info($current_goods);
                 $goodsList[] =$current_goods;
@@ -370,9 +374,27 @@ class TaoKe extends BaseController
         return app('json')->success('获取拼多多商品列表成功', $result['data']);
     }
 
+
+    /**
+     * 获取拼多多分类
+     * @return mixed
+     * @author daoheng
+     */
+    public function pdd_cat()
+    {
+        $parentId = $this->request->param('parentId') ?? 0;
+        $result = DaTaoKe::pddCatList($parentId);
+        if ($result['code'] == 0) {
+            return app('json')->fail('运行出错', $result['data']);
+        }
+        return app('json')->success('获取拼多多商品分类成功', $result['data']);
+    }
+
+
+
     //获取多多进宝商品详情
     public function pdd_detail()
-    {
+    {       
         $goodsId = $this->request->param('goodsId');
         try{
             $uid = $this->request->uid();

route/api.php

@@ -832,6 +832,8 @@ Route::group('api/', function () {
 
     })->middleware(\app\common\middleware\UserTokenMiddleware::class, false);
 
+    //获取拼多多分类
+    Route::get('pdd/cat', 'api.store.product.TaoKe/pdd_cat')->middleware(\app\common\middleware\UserTokenMiddleware::class, false);
     //获取拼多多商品详情
     Route::get('pdd/detail', 'api.store.product.TaoKe/pdd_detail')->middleware(\app\common\middleware\UserTokenMiddleware::class, false);
     //唯品会商品详情