Merge tag '0元购商品修复' into develop

zhaojs

2023-07-20 2d17ad0566b8e0efc319f926fd08316c8ab34ead

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

@@ -36,6 +36,7 @@
        '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',
        'bottom_price_url'=>'https://openapi.dataoke.com/api/goods/get-history-low-price-list',
    ];

    const shop_type = ["0"=>"淘宝","1"=>"天猫","2"=>"天猫超市","3"=>"天猫国际"];
@@ -159,6 +160,36 @@
         $result['data']=$list;
         return $result;
      }

      /**
       * 历史新低商品
       */
      public function bottomPrice($pageSize,$pageId,$cids,$sort)
      {
            if($cids==0)
            {
                $cids="";
            }
            $params_data = [
                'pageSize'=>$pageSize,
                'pageId' =>$pageId,
                'cids' => $cids,
                'sort'=>$sort
            ];
            $params = $this->setParams($params_data);
            $result = send_get(self::request_url['bottom_price_url'],$params);
            if(empty($result) || $result['code'] != 0) return [];
            $list = $result['data']['list'];
            if(!empty($list)){
                foreach($list as &$goods){
                    $goods = self::GetGoodsFy($goods,$goods["actualPrice"],$goods["commissionRate"]);
                }
            }
            $result['data']['list']=$list;
            return $result;
      }


    /**
     * 获取专辑列表
     *
@@ -329,20 +360,23 @@
     * @param [type] $nineCid 9.9精选的类目id，分类id请求详情：-1-精选，1 -5.9元区，2 -9.9元区，3 -19.9元区（调整字段）
     * @return void
     */
    public function getOpGoodsList($nineCid,$page = 1,$page_size)
    public function getOpGoodsList($nineCid,$page = 1,$page_size,$excludecid=[])
    {
        $params = $this->setParams(['version'=>'v3.0.0','nineCid'=>$nineCid,'pageId'=>$page,'pageSize'=>$page_size]);
        $result = send_get(self::request_url['op_goods_list_url'],$params);
        if(empty($result) || $result['code'] != 0) return [];

        $list = $result['data']['list'];

        $list_new=[];
        if(!empty($list)){
            foreach($list as &$goods){
                //排除指定分类
                if(!empty($excludecid) && in_array($goods['cid'],$excludecid)) continue;
                $goods = self::initGoods($goods);
                array_push($list_new,$goods);
            }
        }
         return $list;
         return $list_new;
    }