添加新人福利

application/api/controller/Airdrop.php

@@ -24,7 +24,7 @@ class Airdrop extends Api
     }
 
     //获取是否领取
-    public function getNewbie(ProductOrder $productOrder)
+    public function getNewbieWeal(ProductOrder $productOrder)
     {
         $info = $productOrder::getUserWelfare($this->auth->id, $productOrder::Newbie);
         $this->success('', boolval($info));
@@ -32,7 +32,7 @@ class Airdrop extends Api
 
 
     //新人福利
-    public function newbie(UserWelfare $userWelfare, ProductOrder $productOrder, UserModel $userModel)
+    public function setNewbieWeal(UserWelfare $userWelfare, ProductOrder $productOrder, UserModel $userModel)
     {
         $row = $userWelfare::getIsWelfare();
         if(empty($row->is_newbie)) $this->error(__('暂未开启'));
@@ -56,7 +56,7 @@ class Airdrop extends Api
 
 
     //超级福利
-    public function getSuper()
+    public function getSuperWeal()
     {
        
         $this->success('', $info);

application/api/logic/WelfareLoginc.php

@@ -37,12 +37,12 @@ class WelfareLoginc
                 ->join('product_list b', "a.product_id = b.id", "left")
                 ->field('a.*,b.is_area,'.$lan.'_name as name')
                 ->where('a.product_id', $productId)->find();
-        if($num > $result->stock) throw new Exception(__('库存不足'));       
+        if($num > $result->stock) throw new Exception(__('库存不足'));
         if(empty($result->is_area)){
             ProductOrder::setPopularNoAreaOrder($num, $result->id, $result->price, $result->product_id, $uid, ProductOrder::Newbie);
         }else{
             $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, ProductOrder::Popular);
+            ProductOrder::setPopularAreaOrder($areaArr, $result->id, $result->price, $result->product_id, $uid, ProductOrder::Newbie);
         }
         return ['start_time'=>$tim, 'name'=>$result->name, 'num'=>$num];
     }