Merge branch 'release/v1.1.4发布'

zhaojs

2023-07-20 8c00bd0245ca4756ca04483a4980ad202714e43e

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

@@ -918,19 +918,41 @@
            'back' => $pageSize
        ];
        $result = send_get(self::request_url['dy_onebuy_url'],$send_data);
        log::write($result);
        if(empty($result) || $result['code'] != 200) fault('数据获取失败');

        $list = $result['data'];

        $list_new=[];
        $title_list=[];
        if(!empty($list)){
            foreach($list as &$goods){
                $itemtitle=$goods['itemtitle'];
                if(empty($title_list)){
                    array_push($title_list,$itemtitle);
                }
                else{
                    //判断商品标题是否相似
                    $is_same=false;
                    foreach($title_list as &$title){
                        similar_text($title,$itemtitle,$percent);
                        log::write($title.'----------'.$itemtitle.'--------------'.$percent);
                        if($percent>60){
                            $is_same=true;
                            break;
                        }
                    }
                    if($is_same){
                        continue;
                    }
                    array_push($title_list,$itemtitle);
                }
                $goods['shoptype']='';
                $goods = self::initDyOneByGoods($goods);
               // $goods = self::initDyOneByGoods($goods);
               array_push($list_new,self::initDyOneByGoods($goods));
            }
            
        }

        return $list;
        return $list_new;
    }


@@ -1035,7 +1057,8 @@
        $init_goods['isCollect'] = self::isCollect($init_goods);
        $init_goods['fanli'] = self::rebate($init_goods["actualPrice"],$goods['dyrates']/100);
        $init_goods['topFanli'] = self::rebate($init_goods['actualPrice'],$goods['dyrates']/100,self::$topFanliRate);
        
        //新增商品类目ID--byhyt
        $init_goods['cid'] = isset($goods['cate_id']) ? $goods['cate_id'] : '';
        return $init_goods;
    }

@@ -1068,7 +1091,8 @@
        $init_goods['isCollect'] = self::isCollect($init_goods);
        $init_goods['fanli'] = self::rebate($init_goods["actualPrice"],$goods['dyrates']/100);
        $init_goods['topFanli'] = self::rebate($init_goods['actualPrice'],$goods['dyrates']/100,self::$topFanliRate);
        
        //新增商品类目ID--byhyt
        $init_goods['cid'] = isset($goods['cate_id']) ? $goods['cate_id'] : '';
        return $init_goods;
    }

@@ -1132,9 +1156,10 @@
        $init_goods['faction'] = 'd';
        $init_goods['labelImg'] = self::initSourse($init_goods['sourceType']);
        $init_goods['isCollect'] = self::isCollect($init_goods);
        $init_goods['fanli'] = self::rebate($init_goods["actualPrice"],$goods['dyrates']/100);
        $init_goods['topFanli'] = self::rebate($init_goods['actualPrice'],$goods['dyrates']/100,self::$topFanliRate);
        
        $init_goods['fanli'] =isset($goods['itemendprice']) ? $goods['itemendprice'] : 0;
        $init_goods['topFanli'] =0;
        //新增商品类目ID--byhyt
        $init_goods['cid'] = isset($goods['cate_id']) ? $goods['cate_id'] : '';
        return $init_goods;
    }