新人福利

application/api/controller/Airdrop.php

@@ -26,13 +26,12 @@ class Airdrop extends Api
     //新人福利
     public function newbie(UserWelfare $userWelfare, ProductOrder $productOrder, UserModel $userModel)
     {
-
         $row = $userWelfare::getIsWelfare();
         if(empty($row->is_newbie)) $this->error(__('暂未开启'));
-
+      
         $info = $productOrder::getUserWelfare($this->auth->id, $productOrder::Newbie);
         if(!empty($info)) $this->error(__('您已领取'));
-        
+
         Db::startTrans();
         try {
             //添加Rwa茶记录
@@ -49,8 +48,8 @@ class Airdrop extends Api
 
 
 
-
-    public function show(int $id)
+    //超级福利
+    public function super()
     {
         $info = (new AnnouncementModel)
             ->where('id', $id)

application/api/logic/WelfareLoginc.php

@@ -38,7 +38,7 @@ class WelfareLoginc
         $tim = time();
         $result = ProductPopular::alias('a')->where('a.start_time', '<=', $tim)->where('a.end_time', '>=', $tim)
                 ->join('product_list b', "a.product_id = b.id", "left")
-                ->field('a.*,b.is_area,'.$lan.'_name')
+                ->field('a.*,b.is_area,'.$lan.'_name as name')
                 ->where('a.product_id', $productId)->find();
         if($num > $result->stock) throw new Exception(__('库存不足'));       
         if(empty($result->is_area)){
@@ -47,7 +47,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->$lan.'_name'];
+        return ['start_time'=>$tim, 'name'=>$result->name];
     }
 
 

application/common/model/ProductOrder.php

@@ -37,7 +37,7 @@ class ProductOrder extends Model
     const Transfer          = 1; //转让
     const Giveaway          = 2; //赠送
     const Newbie            = 3; //新人茶权空投
-    const Super             = 4; //新人福利空投
+    const Super             = 4; //新人福利空投 
     /* 
      *  订单状态 '已下单', 1=>'已付款', 2=>'已转让', 3=>'提货', 4=>'已取消', 5=>'完成'];
      */