From 73e8924ae3a93d4b6a69579ccc464cc599af2bd6 Mon Sep 17 00:00:00 2001
From: zhaojs <349234519@qq.com>
Date: 星期五, 04 八月 2023 10:06:43 +0800
Subject: [PATCH] no message
---
application/api/logic/taoke/device/Dataoke.php | 21 ++++++++++++++-------
1 files changed, 14 insertions(+), 7 deletions(-)
diff --git a/application/api/logic/taoke/device/Dataoke.php b/application/api/logic/taoke/device/Dataoke.php
index aa12ddd..6088dea 100644
--- a/application/api/logic/taoke/device/Dataoke.php
+++ b/application/api/logic/taoke/device/Dataoke.php
@@ -38,7 +38,7 @@
'similer_url'=>'https://openapi.dataoke.com/api/goods/list-similer-goods-by-open',
'gift_money_url'=>'https://openapi.dataoke.com/api/goods/first-order-gift-money',
'bottom_price_url'=>'https://openapi.dataoke.com/api/goods/get-history-low-price-list',
- 'jdnines_url'=>'https://openapi.dataoke.com/api/dels/jd/column/list-nines',
+ 'jdnines_url'=>'https://openapi.dataoke.com/api/dels/jd/column/list-nines'
];
const shop_type = ["0"=>"娣樺疂","1"=>"澶╃尗","2"=>"澶╃尗瓒呭競","3"=>"澶╃尗鍥介檯"];
@@ -302,7 +302,7 @@
* @param mixed 澶ф窐瀹㈢殑浜岀骇绫荤洰id锛岄�氳繃瓒呯骇鍒嗙被API鑾峰彇銆備粎鍏佽浼犱竴涓簩绾d锛屽綋涓�绾х被鐩甶d鍜屼簩绾х被鐩甶d鍚屾椂浼犲叆鏃讹紝浼氳嚜鍔ㄥ拷鐣ヤ簩绾х被鐩甶d
* @return void
*/
- public function getGoodsList($cids,$subcid,$sort=0,$page = 1,$page_size,$tchaoshi=0,$secrend_search=0)
+ public function getGoodsList($cids,$subcid,$sort=0,$page = 1,$page_size,$tchaoshi=0,$secrend_search=0,$couponPriceLowerLimit="")
{
$params = $this->setParams(['cids'=>$cids,'tchaoshi'=>$tchaoshi,'subcid'=>$subcid,'sort'=>$sort,'pageId'=>$page,'pageSize'=>$page_size]);
if($secrend_search>0)
@@ -330,6 +330,10 @@
default:
break;
}
+ }
+ if(!empty($couponPriceLowerLimit))
+ {
+ $params['couponPriceLowerLimit']=$couponPriceLowerLimit;
}
$result = send_get(self::request_url['goods_list'],$params);
@@ -427,9 +431,9 @@
*
* @return void
*/
- public function superSearch($keyWords,$page = 1,$page_size,$sort)
+ public function superSearch($keyWords,$page = 1,$page_size,$sort,$tmall=0)
{
- $params = $this->setParams(['type'=>"0",'keyWords'=>$keyWords,'type'=>0,'pageId'=>$page,'pageSize'=>$page_size,'sort'=>$sort]);
+ $params = $this->setParams(['type'=>"0",'keyWords'=>$keyWords,'type'=>0,'pageId'=>$page,'pageSize'=>$page_size,'sort'=>$sort,'tmall'=>$tmall]);
$result = send_get(self::request_url['super_search_url'],$params);
if(empty($result) || $result['code'] != 0) return [];
$list = $result['data']['list'];
@@ -855,7 +859,7 @@
$init_goods["monthSales"] = isset($goods['inOrderCount30Days']) ? format_number($goods['inOrderCount30Days']) : 0; //30澶╅攢閲�
$init_goods['twoHoursSales'] = isset($goods['inOrderCount30Days']) ? format_number($goods['inOrderCount30Days']) : 0; //
//$init_goods['specialText'] = isset($goods['specialText']) ? $goods['specialText'] : [];
- $init_goods["mainPic"] = isset($goods['smallImages']) ? $goods['smallImages'] : ''; //鍟嗗搧涓诲浘
+ $init_goods["mainPic"] = isset($goods['picMain']) ? $goods['picMain'] : ''; //鍟嗗搧涓诲浘
//$init_goods["video"] = isset($goods['video']) ? $goods['video'] : ''; //鍟嗗搧瑙嗛
$init_goods['couponLink'] = isset($goods['couponLink']) ? $goods['couponLink'] : ''; //浼樻儬鍒搁摼鎺�
$init_goods['couponEndTime'] = isset($goods['couponEndTime']) && !empty($goods['couponEndTime']) ? date('Y-m-d',strtotime($goods['couponEndTime'])) : ''; //浼樻儬鍒哥粨鏉熸椂闂�
@@ -877,8 +881,8 @@
}
} */
$init_goods['desc'] = isset($goods['extensionContent']) ? $goods['extensionContent'] : ''; //鎺ㄥ箍鏂囨
- //!empty($goods['imgs']) && $init_goods['imgs'] = explode(",",$goods['imgs']);
- empty($goods['imgs'])&& $init_goods['imgs'] =explode(",",$goods['picMain']);
+ $init_goods['imgs'] = isset($goods['smallImages']) ? $goods['smallImages'] : [];
+ empty($goods['smallImages'])&& $init_goods['smallImages'] =explode(",",$goods['smallImages']);
//!empty($goods['reimgs']) && $init_goods['reimgs'] = explode(",",$goods['reimgs']);
if(!empty($goods['detailPics'])){
$detailPics = json_decode($goods['detailPics'],true);
@@ -892,6 +896,7 @@
}else{
$init_goods['detailPics'] = $init_goods['imgs'];
}
+ $init_goods['faction']='j';
/* $init_goods['isSubdivision'] = isset($goods['isSubdivision']) ? $goods['isSubdivision'] : 0; // 璇ュ晢鍝佹槸鍚︽湁缁嗗垎绫荤洰
$init_goods['subdivisionId'] = isset($goods['subdivisionId']) ? $goods['subdivisionId'] : ''; //璇ュ晢鍝佹墍灞炵粏鍒嗙被鐩甶d
$init_goods['subdivisionName'] = isset($goods['subdivisionName']) ? $goods['subdivisionName'] : ''; //璇ュ晢鍝佹墍灞炵粏鍒嗙被鐩悕绉�
@@ -982,6 +987,8 @@
$init_goods['fanli'] = self::rebate($goods['actualPrice'],$goods['commissionRate']/100);
$init_goods['topFanli'] = self::rebate($goods['actualPrice'],$goods['commissionRate']/100,self::$topFanliRate);
$init_goods['isCollect'] = self::isCollect($init_goods);
+ //琛ュ厖杩斿洖鍊煎晢鍝佺被鐩�
+ $init_goods['cid'] = isset($goods['cid']) ? $goods['cid'] : '';
return $init_goods;
}
--
Gitblit v1.9.3