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/Jd.php | 45 +++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 45 insertions(+), 0 deletions(-)
diff --git a/application/api/logic/taoke/device/Jd.php b/application/api/logic/taoke/device/Jd.php
index 23b1c50..1bac172 100644
--- a/application/api/logic/taoke/device/Jd.php
+++ b/application/api/logic/taoke/device/Jd.php
@@ -299,6 +299,47 @@
'pageSize' => $pageSize,
'keyword' => $keyword
];
+
+ if($isCoupon == 1)$send_data['isCoupon'] = $isCoupon;
+ $result = send_get(self::request_url['search_url'],$send_data);
+ if(empty($result) || $result['return'] != 0) return [];
+ $list = $result['result']['goods'];
+ if(!empty($list)){
+ foreach($list as &$goods){
+ $goods = self::initSearchGoods($goods);
+ }
+ }
+ return $list;
+ }
+
+ /**
+ * 鎼滅储鍟嗗搧锛堝鍔犵被鐩甶d--hyt锛� http://jingtuitui.com/api_item?id=3
+ *
+ * @param [type] $keyword 鍏抽敭璇�
+ * @param [type] $sort asc=鍗囬檷搴忥紱desc=榛樿闄嶅簭
+ * @param [type] $owner 鍟嗗搧绫诲瀷 锛氾紙g:鑷惀锛沺:POP锛�
+ * @param [type] $isCoupon 鏄惁鏄紭鎯犲埜鍟嗗搧 1=鏈変紭鎯犲埜
+ * @param [type] $sortName 鎺掑簭瀛楁 price鍗曚环锛� commissionShare浣ｉ噾姣斾緥锛� commission浣ｉ噾锛沬nOrderCount30Days 30澶╁紩鍗曢噺锛沬nOrderComm30Days 30澶╂敮鍑轰剑閲�
+ * @param [type] $page
+ * @param [type] $pageSize
+ * @param [type] $cid1 绫荤洰id
+ * @return void
+ */
+ public function search_cid_Goods($keyword,$sort,$owner,$isCoupon,$sortName,$page,$pageSize,$cid1)
+ {
+ $send_data = [
+ 'appkey' => $this->appkey,
+ 'appid' => $this->appid,
+ 'v' => $this->search_version,
+ 'sort' => $sort,
+ 'owner' => $owner,
+ 'sortName' => $sortName,
+ 'pageIndex' => $page,
+ 'pageSize' => $pageSize,
+ 'keyword' => $keyword,
+ 'cid1' => $cid1
+ ];
+
if($isCoupon == 1)$send_data['isCoupon'] = $isCoupon;
$result = send_get(self::request_url['search_url'],$send_data);
if(empty($result) || $result['return'] != 0) return [];
@@ -422,6 +463,8 @@
if($init_goods["originalPrice"])$init_goods["originalPrice"] = (string)$init_goods["originalPrice"];
$init_goods['fanli'] = self::rebate($goods['final_price'],$goods['commissionShare']/100);
$init_goods['topFanli'] = self::rebate($goods['final_price'],$goods['commissionShare']/100,self::$topFanliRate);
+ //鏂板鍟嗗搧绫荤洰ID--byhyt
+ $init_goods['cid'] = isset($goods['categoryInfo']['cid1']) ? $goods['categoryInfo']['cid1'] : '';
return $init_goods;
}
@@ -470,6 +513,8 @@
$init_goods['isCollect'] = self::isCollect($init_goods);
$init_goods['fanli'] = self::rebate($init_goods["actualPrice"],$goods['commissionInfo']['commissionShare']/100);
$init_goods['topFanli'] = self::rebate($init_goods['actualPrice'],$goods['commissionInfo']['commissionShare']/100,self::$topFanliRate);
+ //鏂板鍟嗗搧绫荤洰ID--byhyt
+ $init_goods['cid'] = isset($goods['categoryInfo']['cid1']) ? $goods['categoryInfo']['cid1'] : '';
return $init_goods;
}
--
Gitblit v1.9.3