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

zhaojs

2023-07-31 34db7035c9c7880e00b9328d022be65a29c62cb2

 application/api/controller/Activity.php

@@ -6,6 +6,7 @@
use app\api\logic\taoke\device\Haodanku;
use app\common\model\FqbCate;
use app\api\logic\taoke\device\Jd as LogicJd;
use app\api\logic\Banner as LogicBanner;

use app\api\logic\ActivityInfo as ActInfo;

@@ -255,4 +256,41 @@
        $user = $this->auth->getUser();
        $this->success('获取成功',$user->invitation_code);
    }


    /**
     * 获取自定义弹窗
     * 
     */
    public function getCustomizePopup()
    {
        $LogicBanner = new LogicBanner();
        $list = $LogicBanner->getList('20,21');
        if(!$list||$list['customizePop']==null||count($list['customizePop'])==0)
        {
            $this->success('获取成功',[]);
        }
        $user = $this->auth->getUser();
        $actInfo=new ActInfo();
        foreach ($list['customizePop'] as $vaule) {
            $paraJson=json_decode($vaule->note);
            $isPop=false;
            switch($paraJson->poptype)
            {
                case 'freebuy'://0元购弹窗
                    $isPop=$actInfo->popupcus_freebuy($user);
                    break;
                default:
                    break;
            }
            if($isPop)
            {
                $this->success('获取成功',['haspop'=>true,'info'=>$vaule]);
                break;
            }
        }
        $this->success('获取成功',['haspop'=>false]);
    }

    
}