Merge remote-tracking branch 'origin/master'

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

@@ -143,13 +143,13 @@ class TaoKe extends BaseController
             'with_coupon' => true,
             'sort_type'=>6
         ];
+
         if($keyword && $token){
             $service = new JwtTokenService();
             $payload = $service->decode($token);
             $uid =$payload->jti[0];
             $this->generateAd($uid);
             $thirdInfo = $this->userThird->getDetail(['uid' => $uid, 'type' => 1]);
-
             $customParameters = json_encode(['uid' => (string)$uid]);
             $auth=$this->isAuthBind($thirdInfo['pid'],$customParameters);
             if($auth==1){
@@ -158,18 +158,21 @@ class TaoKe extends BaseController
                 $params['pid']=$thirdInfo['pid'];
                 $params['custom_parameters']=$customParameters;
             }else{
-                $apiName = 'pdd.ddk.rp.prom.url.generate';
-                $params = [
-                    'channel_type' => 10,
-                    'custom_parameters' => $customParameters,
-                    'p_id_list' => json_encode([$thirdInfo['pid']]),
-                    'generate_we_app' => 'true'
-                ];
-                $response = $this->getUrlResult($apiName, $params);
-//                $data['pdd_mobile_url']=$response['rp_promotion_url_generate_response']['url_list'][0]['mobile_url'];
-                $data=$response['rp_promotion_url_generate_response']['url_list'][0];
-                return app('json')->success(json_encode($data), []);
-//                var_dump($response);die;
+//                $apiName = 'pdd.ddk.rp.prom.url.generate';
+//                $params = [
+//                    'channel_type' => 10,
+//                    'custom_parameters' => $customParameters,
+//                    'p_id_list' => json_encode([$thirdInfo['pid']]),
+//                    'generate_we_app' => 'true'
+//                ];
+//                $response = $this->getUrlResult($apiName, $params);
+////                $data['pdd_mobile_url']=$response['rp_promotion_url_generate_response']['url_list'][0]['mobile_url'];
+//                $data=$response['rp_promotion_url_generate_response']['url_list'][0];
+//                return app('json')->success($data);
+////                var_dump($response);die;
+                $params['pid']='42283665_303898619';
+                $params['keyword']=$keyword;
+                $params['custom_parameters']= '{"uid":"17"}';
             }
         }
         if($keyword && !isset($params['pid'])){