Merge branch 'release/v1.1.5发布'

zhaojs

2023-07-31 8dcfae4fff98fbbb19ff46bd9750f25bc56801a9

 application/api/controller/Activity.php

@@ -6,13 +6,14 @@
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;

header("Access-Control-Allow-Origin:*");
class Activity extends Api
{
    protected $noNeedLogin = ['fqb_plat_cate','run_countRecruitAct'];
    protected $noNeedLogin = ['fqb_plat_cate','run_countRecruitAct','test'];
    protected $noNeedRight = '*';
    /**
     * 获取疯抢榜
@@ -232,6 +233,12 @@
        $this->success('获取成功',$res);
    }

    public function test()
    {
        $actInfo=new ActInfo();
        $res=$actInfo->updateRecruitCount(2);
    }

    /**
     * 招募活动计算
     */
@@ -249,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]);
    }

    
}