Merge branch 'hotfix/618修复'

zhaojs

2023-06-21 d1c80c8e12a2a1d3d7c25ee01d6c1b097917e5e2

 application/api/logic/taoke/device/Haodanku.php

@@ -4,7 +4,7 @@
use app\api\logic\taoke\Parser;
use fast\Http;
use think\Cache;

use think\log;

class Haodanku extends Parser
{
@@ -132,6 +132,16 @@
        $result = $http->post(self::request_url['get_dyitem_link_url'],$send_data);
        if(empty($result)) fault('数据获取失败');
        $result = json_decode($result, true);
        //获取抖音详情（兼容ios打开抖音商品问题）
        $d_send_data = [
            'itemid' => $itemid,
            'apikey' => $this->apikey,
        ];
        $d_result = send_get(self::request_url['dy_goods_detail_url'],$d_send_data);
        if(!empty($d_result))
        {
            $result['data']['detail_url']=$d_result['data'][0]['detail_url'];
        }
        return isset($result['data']) ? $result['data'] : [];
    }

@@ -148,9 +158,11 @@
            'apikey' => $this->apikey,
        ];
        $result = send_get(self::request_url['dy_goods_detail_url'],$send_data);
        if(empty($result) || $result['code'] != 200) fault('数据获取失败');
        if(empty($result) || $result['code'] != 200) return [];

        $goods = isset($result['data'][0]) ? $result['data'][0] : [];

        if(empty($goods['product_id'])) return [];
        
        $goods = self::initDyDetailGoods($goods);
        
@@ -556,7 +568,7 @@
            'back' => $pageSize
        ];
        $result = send_get(self::request_url['dy_goods_url'],$send_data);

        log::write($result);
        if(empty($result) || $result['code'] != 200) fault('数据获取失败');

        $list = $result['data'];
@@ -774,8 +786,8 @@
        }
        $init_goods['labelImg'] = self::initSourse($init_goods['sourceType']);
        if(empty($init_goods['detailPics']))$init_goods['detailPics'] = $init_goods['mainPic'];
        $init_goods['fanli'] = self::rebate($init_goods["actualPrice"],$goods['tkrates']);
        $init_goods['topFanli'] = self::rebate($init_goods['actualPrice'],$goods['tkrates'],self::$topFanliRate);
        $init_goods['fanli'] = self::rebate($init_goods["actualPrice"],$goods['tkrates']/100);
        $init_goods['topFanli'] = self::rebate($init_goods['actualPrice'],$goods['tkrates']/100,self::$topFanliRate);
        return $init_goods;
    }

@@ -873,8 +885,8 @@
        $init_goods['sourceType'] = "tb";
        $init_goods['faction'] = "j";
        $init_goods['isCollect'] = self::isCollect($init_goods);
        $init_goods['fanli'] = self::rebate($init_goods["actualPrice"],$goods['commission_rate']);
        $init_goods['topFanli'] = self::rebate($init_goods['actualPrice'],$goods['commission_rate'],self::$topFanliRate);
        $init_goods['fanli'] = self::rebate($init_goods["actualPrice"],$goods['commission_rate']/100);
        $init_goods['topFanli'] = self::rebate($init_goods['actualPrice'],$goods['commission_rate']/100,self::$topFanliRate);
        return $init_goods;
    }