是否领取

application/api/controller/Airdrop.php

@@ -23,6 +23,14 @@ class Airdrop extends Api
         $this->lan = $this->request->getLan();
     }
 
+    //获取是否领取
+    public function getNewbie(ProductOrder $productOrder)
+    {
+        $info = $productOrder::getUserWelfare($this->auth->id, $productOrder::Newbie);
+        $this->success('', boolval($info));
+    }
+
+
     //新人福利
     public function newbie(UserWelfare $userWelfare, ProductOrder $productOrder, UserModel $userModel)
     {
@@ -51,14 +59,7 @@ class Airdrop extends Api
     //超级福利
     public function super()
     {
-        $info = (new AnnouncementModel)
-            ->where('id', $id)
-            ->where('status', 1)
-            ->field('id,img_url,body,createtime,' . $this->lan.'_title as title')
-            ->find();
-        if(empty($info)){
-            $this->error('公告信息不存');
-        }
+       
         $this->success('', $info);
     }
 

application/api/logic/WelfareLoginc.php

@@ -25,13 +25,10 @@ class WelfareLoginc
 {
  
     /** 添加新人福利
-     * @param int   $orderId 订单id
-     * @param array $orderInfo 订单详情
-     * @param int   $typeId    订单类型
-     * @param int   $userId    用户id
-     * @param int   $fromUser  来源id
-     * @param float $fees      手续费
-     * @param float $fees      抢购价
+     * @param int   $uid       用户id
+     * @param array $productId 产品ID
+     * @param int   $num       数量
+     * @param int   $lan       语言
      */
     public static function setUserWelfareLos($uid, int $productId, $num, $lan)
     {
@@ -47,7 +44,7 @@ class WelfareLoginc
             $areaArr = ProductArea::where('product_id', $productId)->where('status', ProductArea::NORMAL)->orderRaw('RAND()')->limit($num)->column('id');
             ProductOrder::setPopularAreaOrder($areaArr, $result->id, $result->price, $result->product_id, $uid);
         }
-        return ['start_time'=>$tim, 'name'=>$result->name];
+        return ['start_time'=>$tim, 'name'=>$result->name, 'num'=>$num];
     }