Merge branch 'hotfix/618修复' into feature/1.1.3api开发

zhaojs

2023-06-19 2ca3644d7bc09271a253014a8cd199dae73470ca

 application/api/controller/Taoke.php

@@ -323,6 +323,9 @@
                {
                    $info['dy_deeplink'] = $info['dy_zlink'];
                }
                else{
                    $info['dy_zlink']=$info['detail_url'];
                }
              
            break;  
        }
@@ -1078,16 +1081,21 @@
    public function identify_goods()
    {
        $goods_url = request()->param('goods_url','', 'urldecode');
        
        log::write('智能搜索内容'.$goods_url);

        if (empty($goods_url)) $this->error('链接不能为空');

        $LogicSearch = new LogicSearch();

        $info = $LogicSearch->ast($goods_url);
        if(!$info["goodsId"]&&$info["title"]){
            $this->success('获取成功',['goods_url'=>$info["title"],'goods'=>[]]);
           
        }
        else{
            $this->success('获取成功',['goods_url'=>$goods_url,'goods'=>$info]);
        }

        $this->success('获取成功',['goods_url'=>$goods_url,'goods'=>$info]);
      
    }


@@ -1109,10 +1117,11 @@
        $sort = request()->param('sort',0);
        
        $tchaoshi=request()->param('tchaoshi',0);

        //二级筛选
        $secrend_search=request()->param('secrend_search',0);
        $LogicDataoke = new LogicDataoke();

        $list = $LogicDataoke->getGoodsList($cateId,$subcid,$sort,$page,$page_size,$tchaoshi);
        $list = $LogicDataoke->getGoodsList($cateId,$subcid,$sort,$page,$page_size,$tchaoshi,$secrend_search);

        if($list === false) $this->error($LogicDataoke->getError());

@@ -1341,4 +1350,27 @@
        $this->success('获取成功',['list' => $list]);
    }

    /**
     * 0元购商品列表（调用9.9包邮精选接口，获取3.9元商品）
     * 
     * @return void
     */
    public function get_first_free_goods(){

        $page = request()->param('page',1);
        $page_size = request()->param('pageSize',40);
        $LogicDataoke = new LogicDataoke();

        $list = $LogicDataoke->getOpGoodsList(1,$page,$page_size);

        if($list === false) $this->error($LogicDataoke->getError());

        foreach($list as $key => $value){
            $list[$key]['fanli'] = $value['actualPrice'];
        }
       // $list= array_slice($list, 0, 40);

        $this->success('获取成功',['list'=>$list]);
    }

}