From 8c00bd0245ca4756ca04483a4980ad202714e43e Mon Sep 17 00:00:00 2001
From: zhaojs <349234519@qq.com>
Date: 星期四, 20 七月 2023 09:40:44 +0800
Subject: [PATCH] Merge branch 'release/v1.1.4发布'
---
application/api/logic/taoke/device/Pdd.php | 32 ++++++++++++++++++++++++++------
1 files changed, 26 insertions(+), 6 deletions(-)
diff --git a/application/api/logic/taoke/device/Pdd.php b/application/api/logic/taoke/device/Pdd.php
index a6da054..b3adba2 100644
--- a/application/api/logic/taoke/device/Pdd.php
+++ b/application/api/logic/taoke/device/Pdd.php
@@ -137,15 +137,25 @@
* @param [type] $goods_sign 鍟嗗搧sign
* @return void
*/
- public function getGoodsDetail($goods_sign,$is_browse = true)
+ public function getGoodsDetail($goods_sign,$is_browse = true,$relationid='')
{
$params = [
'goods_sign' => $goods_sign
];
+ if(!empty($relationid))
+ {
+ $params['custom_parameters']='{"uid":"'.$relationid.'"}';
+ if(!empty(MOBILE_INFO)){
+ $params['pid'] = MOBILE_INFO == "IOS" ? $this->config['ios_pid'] : $this->config['android_pid'];
+ }else{
+ return [];
+ }
+ }
$send_data = $this->makeSign($params,self::request_url['goods_detail_url']);
$result = send_get(self::base_url,$send_data);
if(empty($result)) fault('鏁版嵁鑾峰彇澶辫触');
- if(isset($result['error_response']) && !empty($result['error_response'])) fault('鏁版嵁鑾峰彇澶辫触(-1)');
+ //if(isset($result['error_response']) && !empty($result['error_response'])) fault('鏁版嵁鑾峰彇澶辫触(-1)');
+ if(isset($result['error_response']) && !empty($result['error_response'])) return [];
$goods = isset($result['goods_detail_response']['goods_details'][0]) ? $result['goods_detail_response']['goods_details'][0] : [];
$goods = $this->initGoods($goods);
if($is_browse)self::browseLog($goods);
@@ -330,16 +340,17 @@
* @param mixed $sort_type 鎺掑簭鏂瑰紡:0-缁煎悎鎺掑簭;1-鎸変剑閲戞瘮鐜囧崌搴�;2-鎸変剑閲戞瘮渚嬮檷搴�;3-鎸変环鏍煎崌搴�;4-鎸変环鏍奸檷搴�;5-鎸夐攢閲忓崌搴�;6-鎸夐攢閲忛檷搴�;7-浼樻儬鍒搁噾棰濇帓搴忓崌搴�;8-浼樻儬鍒搁噾棰濇帓搴忛檷搴�;9-鍒稿悗浠峰崌搴忔帓搴�;10-鍒稿悗浠烽檷搴忔帓搴�;11-鎸夌収鍔犲叆澶氬杩涘疂鏃堕棿鍗囧簭;12-鎸夌収鍔犲叆澶氬杩涘疂鏃堕棿闄嶅簭;13-鎸変剑閲戦噾棰濆崌搴忔帓搴�;14-鎸変剑閲戦噾棰濋檷搴忔帓搴�;15-搴楅摵鎻忚堪璇勫垎鍗囧簭;16-搴楅摵鎻忚堪璇勫垎闄嶅簭;17-搴楅摵鐗╂祦璇勫垎鍗囧簭;18-搴楅摵鐗╂祦璇勫垎闄嶅簭;19-搴楅摵鏈嶅姟璇勫垎鍗囧簭;20-搴楅摵鏈嶅姟璇勫垎闄嶅簭;27-鎻忚堪璇勫垎鍑昏触鍚岀被搴楅摵鐧惧垎姣斿崌搴忥紝28-鎻忚堪璇勫垎鍑昏触鍚岀被搴楅摵鐧惧垎姣旈檷搴忥紝29-鐗╂祦璇勫垎鍑昏触鍚岀被搴楅摵鐧惧垎姣斿崌搴忥紝30-鐗╂祦璇勫垎鍑昏触鍚岀被搴楅摵鐧惧垎姣旈檷搴忥紝31-鏈嶅姟璇勫垎鍑昏触鍚岀被搴楅摵鐧惧垎姣斿崌搴忥紝32-鏈嶅姟璇勫垎鍑昏触鍚岀被搴楅摵鐧惧垎姣旈檷搴�
* @return void
*/
- public function searchGoods($keyword='',$opt_id='',$common_relation_id,$with_coupon = '',$page,$pageSize,$sort_type = 0)
+ public function searchGoods($keyword='',$opt_id='',$common_relation_id,$with_coupon = '',$page,$pageSize,$sort_type = 0,$cat_id='')
{
$params = [
'keyword' => $keyword,
'opt_id' => $opt_id,
- 'limit' => $pageSize,
+ 'page_size' => $pageSize,
'custom_parameters' => '{"uid":"'.$common_relation_id.'"}',
'with_coupon' => empty($with_coupon) ? '' : ($with_coupon == 1 ? "true" : "false"),
'page' => $page,
'sort_type' => $sort_type,
+ 'cat_id' => $cat_id
];
if(!empty(MOBILE_INFO)){
@@ -349,7 +360,7 @@
}
$send_data = $this->makeSign($params,self::request_url['search_goods_url']);
$result = send_get(self::base_url,$send_data);
- if(empty($result) || isset($result['error_response'])) fault('鏁版嵁鑾峰彇澶辫触');
+ if(empty($result) || isset($result['error_response'])) return []; //fault('鏁版嵁鑾峰彇澶辫触');
$list = $result['goods_search_response']['goods_list'];
if(!empty($list)){
$tmp = [];
@@ -357,7 +368,13 @@
if(isset($goods['goods_id']) && isset($goods['goods_name'])){
$goods = self::initGoods($goods);
array_push($tmp,$goods);
- }else{
+ }
+ else if (isset($goods['goods_id']) && isset($goods['goods_sign']))
+ {
+ $goods= self::getGoodsDetail($goods['goods_sign'],false);
+ //array_push($tmp,$goods);
+ }
+ else{
$list = [];
break;
}
@@ -421,6 +438,7 @@
$init_goods['shopLogo'] = isset($goods['mall_img_url']) ? $goods['mall_img_url'] : '';
$init_goods['sourceType'] = "pdd";
$init_goods['faction'] = "p";
+ $init_goods['predictPromotionRate']= isset($goods['predict_promotion_rate']) ? $goods['predict_promotion_rate'] : 1;
$init_goods['desc'] = isset($goods['goods_desc']) ? $goods['goods_desc'] : ''; //鎺ㄥ箍鏂囨
$init_goods['imgs'] = $init_goods['detailPics'] = isset($goods['goods_gallery_urls']) ? $goods['goods_gallery_urls'] : ''; //杞挱鍥�
$init_goods['video'] = isset($goods['video_url']) ? $goods['video_url'] : ''; //瑙嗛
@@ -435,6 +453,8 @@
$init_goods['isCollect'] = self::isCollect($init_goods);
$init_goods['fanli'] = self::rebate($init_goods["actualPrice"],$goods['promotion_rate']/1000);
$init_goods['topFanli'] = self::rebate($init_goods['actualPrice'],$goods['promotion_rate']/1000,self::$topFanliRate);
+ //鏂板鍟嗗搧绫荤洰ID--byhyt
+ $init_goods['cid'] = isset($goods['cat_ids'][0]) ? $goods['cat_ids'][0] : '';
return $init_goods;
}
--
Gitblit v1.9.3