From 9df5e4341a95c35b00e651d49ff789576f28e897 Mon Sep 17 00:00:00 2001
From: zhaojs <349234519@qq.com>
Date: 星期五, 09 六月 2023 21:21:59 +0800
Subject: [PATCH] Merge branch 'feature/v1.1.2api' into develop
---
application/api/logic/taoke/device/Dataoke.php | 207 ++++++++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 201 insertions(+), 6 deletions(-)
diff --git a/application/api/logic/taoke/device/Dataoke.php b/application/api/logic/taoke/device/Dataoke.php
index 0a169cb..dab5e7c 100644
--- a/application/api/logic/taoke/device/Dataoke.php
+++ b/application/api/logic/taoke/device/Dataoke.php
@@ -28,7 +28,14 @@
'goods_list' => 'https://openapi.dataoke.com/api/goods/get-goods-list',
'price_trend_url'=>'https://openapi.dataoke.com/api/goods/price-trend',
'album_url' => 'https://openapi.dataoke.com/api/album/album-list',
- 'album_goods_url'=>'https://openapi.dataoke.com/api/album/goods-list'
+ 'album_goods_url'=>'https://openapi.dataoke.com/api/album/goods-list',
+ 'fqb_url'=>'https://dtkapi.ffquan.cn/dtk_go_app_api/v1/page-goods-ranking',
+ 'zsz_url'=>'https://dtkapi.ffquan.cn/dtk_go_app_api/v1/page-super-discount',
+ 'xy_url'=>'https://v2.api.haodanku.com/makeup_items',
+ 'friends-circle-list'=>'https://openapi.dataoke.com/api/goods/friends-circle-list',
+ 'parse_url'=>'https://openapi.dataoke.com/api/dels/kit/contentParse',
+ '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',
];
const shop_type = ["0"=>"娣樺疂","1"=>"澶╃尗","2"=>"澶╃尗瓒呭競","3"=>"澶╃尗鍥介檯"];
@@ -94,7 +101,64 @@
return $data;
}
+
+ /**
+ * 澶ф窐瀹㈢柉鎶㈡
+ *
+ */
+ public function fqbGoodsList($cid,$type,$pid)
+ {
+ $params = $this->setParams(['cId'=>$cid,'type'=>$type,'app_key'=>$pid]);
+ $result = send_get(self::request_url['fqb_url'],$params);
+ if(empty($result) || $result['code'] != 1) return [];
+ $list = $result['data']['data'];
+ if(!empty($list)){
+ foreach($list as &$goods){
+ $goods = self::GetGoodsFy($goods,$goods["jiage"],$goods["yongjin"]/100);
+ }
+ }
+ $result['data']['data']=$list;
+ return $result;
+ }
+ /**
+ *
+ *鎶樹笂鎶樺崟椤垫帴鍙�
+ */
+ public function zszGoodsList($cid,$appkey)
+ {
+ $params = $this->setParams(['cId'=>$cid,'app_key'=>$appkey]);
+ $result = send_get(self::request_url['zsz_url'],$params);
+ if(empty($result) || $result['code'] != 1) return [];
+ $list = $result['data']['data']['list'];
+ if(!empty($list)){
+ foreach($list as &$goods){
+ $goods = self::GetGoodsFy($goods,$goods["jiage"],$goods["yongjin"]/100);
+ }
+ }
+ $result['data']['data']['list']=$list;
+ return $result;
+ }
+
+ /**
+ *
+ *灏忔牱鍗曢〉鎺ュ彛
+ */
+
+ public function xyGoodsList($apikey,$keyword,$min_id,$back)
+ {
+ $params = $this->setParams(['apikey'=>$apikey,'keyword'=>$keyword,'min_id'=>$min_id,'back'=>$back]);
+ $result = send_get(self::request_url['xy_url'],$params);
+ if(empty($result) || $result['code'] != 200) return [];
+ $list = $result['data'];
+ if(!empty($list)){
+ foreach($list as &$goods){
+ $goods = self::GetGoodsFy($goods,$goods["itemendprice"],$goods["tkrates"]);
+ }
+ }
+ $result['data']=$list;
+ return $result;
+ }
/**
* 鑾峰彇涓撹緫鍒楄〃
*
@@ -184,9 +248,9 @@
* @param mixed 澶ф窐瀹㈢殑浜岀骇绫荤洰id锛岄�氳繃瓒呯骇鍒嗙被API鑾峰彇銆備粎鍏佽浼犱竴涓簩绾d锛屽綋涓�绾х被鐩甶d鍜屼簩绾х被鐩甶d鍚屾椂浼犲叆鏃讹紝浼氳嚜鍔ㄥ拷鐣ヤ簩绾х被鐩甶d
* @return void
*/
- public function getGoodsList($cids,$subcid,$sort=0,$page = 1,$page_size)
+ public function getGoodsList($cids,$subcid,$sort=0,$page = 1,$page_size,$tchaoshi=0)
{
- $params = $this->setParams(['cids'=>$cids,'subcid'=>$subcid,'sort'=>$sort,'pageId'=>$page,'pageSize'=>$page_size]);
+ $params = $this->setParams(['cids'=>$cids,'tchaoshi'=>$tchaoshi,'subcid'=>$subcid,'sort'=>$sort,'pageId'=>$page,'pageSize'=>$page_size]);
$result = send_get(self::request_url['goods_list'],$params);
@@ -337,7 +401,8 @@
if(empty($result) || $result['code'] != 0) fault('鍒搁摼鎺ヨ幏鍙栧け璐�');
$info = $result['data'];
-
+ $info["tpwd"]= $info['longTpwd'];
+ // $info["link"]= $info['shortUrl'];
$info['kuaiZhanUrl'] = isset($info['kuaiZhanUrl']) ? $info['kuaiZhanUrl'] : '';
return $info;
@@ -549,6 +614,135 @@
return $list;
}
+
+ /**
+ * 鑾峰彇鍟嗗搧鍒嗕剑淇℃伅
+ *
+ */
+
+ private static function GetGoodsFy($goods,$actprice,$rate)
+ {
+ //璁＄畻杩斿埄閲戦
+ $goods['fanli'] = self::rebate($actprice,$rate);
+ $goods['topFanli'] = self::rebate($actprice,$rate,self::$topFanliRate);
+ return $goods;
+ }
+
+ /**
+ * 鏈嬪弸鍦堟枃妗� https://www.dataoke.com/kfpt/api-d.html?id=62
+ *
+ * @param integer $page
+ * @param [type] $page_size
+ * @return void
+ */
+ public function getFriendscircles($page = 1,$page_size = 10,$cid,$sort){
+ $params = $this->setParams(['pageId'=>$page,'pageSize'=>$page_size,'cid'=>$cid,'sort'=>$sort]);
+ $result = send_get(self::request_url['friends-circle-list'],$params);
+ if(empty($result) || $result['code'] != 0) fault($result['msg']);
+ $list = $result['data'];
+ if(empty($list)) return [];
+ if(!empty($list)){
+ foreach($list['list'] as &$goods){
+ $goods = self::GetGoodsFy($goods,$goods["actualPrice"],$goods["commissionRate"]/100);
+ }
+ }
+ return $list;
+ }
+
+ /**
+ * 鍓垏鏉胯瘑鍒� https://www.dataoke.com/kfpt/api-d.html?id=80
+ *
+ * @param [type] $url
+ * @return void
+ */
+ public function zhuanlian($url)
+ {
+ $params = $this->setParams(['content'=>$url]);
+
+ $result = send_get(self::request_url['parse_url'],$params);
+
+ if(empty($result) || $result['code'] != 0) return [];
+
+ $list = $result['data'];
+
+ $goods_id=$list["itemId"];
+ $params = $this->setParams(['goodsId'=>$goods_id]);
+
+ $result2 = send_get(self::request_url['goods_detail_url'],$params);
+
+ if(empty($result2) || $result2['code'] != 0) fault('鍟嗗搧淇℃伅鑾峰彇澶辫触');
+
+ $goods = $result2['data'];
+
+
+ $goods = self::initGoods($goods);
+
+ return $goods;
+ }
+
+ /**
+ * 鐚滀綘鍠滄鍟嗗搧 https://www.dataoke.com/pmc/api-d.html?id=16
+ *
+ * @param [type] $goodsId
+ * @param [type] $page_size 姣忛〉鏁版嵁
+ * @return void
+ */
+ public function getSimilarInfo($goods_id,$page_size)
+ {
+ $params = $this->setParams(['id'=>$goods_id,'size'=>$page_size]);
+
+ $result = send_get(self::request_url['similer_url'],$params);
+
+ if(empty($result) || $result['code'] != 0) return [];
+
+ $list = $result['data'];
+
+ if(!empty($list)){
+
+ foreach($list as &$goods){
+
+ $goods = self::initGoods($goods);
+ }
+ }
+
+ return $list;
+ }
+
+
+
+ /**
+ * 娣樼ぜ閲戝晢鍝� https://www.dataoke.com/kfpt/api-d.html?id=29
+ *
+ * @param [type] $page
+ * @param [type] $page_size
+ * @return void
+ */
+ public function GetFirstOrderGiftMoney($pageSize,$pageId)
+ {
+ log::write($pageSize);
+ $params = $this->setParams(['pageSize'=>$pageSize,'pageId'=>$pageId]);
+
+ $result = send_get(self::request_url['gift_money_url'],$params);
+
+ if(empty($result) || $result['code'] != 0) return [];
+
+ $list = $result['data'];
+
+ if(!empty($list)){
+
+ foreach($list as &$goods){
+
+ // log::write($goods);
+ // if((double)$goods['firstOrderAmount']<4){
+ // //鍒犻櫎浣ｉ噾灏忎簬4鐨勫晢鍝�
+ // $list=array_diff_key($data, ['id'=>$goods['id']]);
+ // }
+
+ }
+ }
+
+ return $list;
+ }
/**
@@ -606,6 +800,7 @@
}
$init_goods['desc'] = isset($goods['desc']) ? $goods['desc'] : ''; //鎺ㄥ箍鏂囨
!empty($goods['imgs']) && $init_goods['imgs'] = explode(",",$goods['imgs']);
+ empty($goods['imgs'])&& $init_goods['imgs'] =explode(",",$goods['mainPic']);
!empty($goods['reimgs']) && $init_goods['reimgs'] = explode(",",$goods['reimgs']);
if(!empty($goods['detailPics'])){
$detailPics = json_decode($goods['detailPics'],true);
@@ -625,8 +820,8 @@
$init_goods['subdivisionRank'] = isset($goods['subdivisionRank']) ? $goods['subdivisionRank'] : ''; //璇ュ晢鍝佹墍灞炵粏鍒嗙被鐩帓鍚�
$init_goods['labelImg'] = self::initSourse($init_goods['sourceType']);
//璁＄畻杩斿埄閲戦
- $init_goods['fanli'] = self::rebate($goods['actualPrice'],$goods['commissionRate']);
- $init_goods['topFanli'] = self::rebate($goods['actualPrice'],$goods['commissionRate'],self::$topFanliRate);
+ $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);
return $init_goods;
}
--
Gitblit v1.9.3