Merge branch 'feature/v1.1.5接口补充2' into develop

zhaojs

2023-08-02 6bf09b5ad960fd4e657c132f9e451c487aa4d9c7

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

@@ -302,7 +302,7 @@
     * @param mixed 大淘客的二级类目id，通过超级分类API获取。仅允许传一个二级id，当一级类目id和二级类目id同时传入时，会自动忽略二级类目id
     * @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'];