添加新人福利

application/api/controller/Airdrop.php

@@ -52,7 +52,7 @@ class Airdrop extends Api
             $result = WelfareLoginc::setUserWelfareLos($this->auth->id, $row->new_product_id, $row->new_num, time(), $this->lan, $productOrder::Newbie);
 
             //添加茶数量
-            if($result['price'] > config('min_rwa_price')) $userModel::updateForRwaNum($this->auth->id, $this->auth->parent_id, $row->new_num, '+');
+            //if($result['price'] > config('min_rwa_price')) $userModel::updateForRwaNum($this->auth->id, $this->auth->parent_id, $row->new_num, '+');
             Db::commit();
         } catch (\Exception $e) {
             Db::rollback();
@@ -87,7 +87,7 @@ class Airdrop extends Api
             $userModel::updateUserLevel($this->auth->id, $this->auth->parent_id);
 
             //添加茶数量
-            if($result['price'] > config('min_rwa_price')) $userModel::updateForRwaNum($this->auth->id, $this->auth->parent_id, $row->super_num, '+');
+            //if($result['price'] > config('min_rwa_price')) $userModel::updateForRwaNum($this->auth->id, $this->auth->parent_id, $row->super_num, '+');
 
             //插入待空投记录
             $rs = UserAirdrop::insert([

application/api/logic/WelfareLoginc.php

@@ -6,7 +6,7 @@ use app\api\controller\Product;
 use app\common\model\ProductArea;
 use app\common\controller\Api;
 use app\common\model\UserWelfare;
-use app\common\model\ProductPopular;
+use app\common\model\ProductLists;
 use app\common\model\ProductOrder;
 use app\common\model\UserModel;
 use think\Loader;
@@ -28,12 +28,12 @@ class WelfareLoginc
      */
     public static function setUserWelfareLos($uid, int $productId, $num, $tim, $lan, $typeId)
     {   
-        $result = ProductPopular::getPopularByTime($productId, $lan, $tim);
-        if(!$result || $num > ($result->stock-$result->init_num - $result->num)) throw new Exception(__('库存不足'));
+        $result = ProductLists::where('id', $productId)->field('id,'.$lan.'_name as name')->find();
+        //if(!$result || $num > ($result->stock-$result->init_num - $result->num)) throw new Exception(__('库存不足'));
       
         //添加产品
-        self::setUserProductOrder($num, $result->is_area, $result->id, $result->price, $productId, $uid, $typeId);
-        return ['start_time'=>$tim, 'name'=>$result->name, 'num'=>$num, 'price'=>$result->price];
+        self::setUserProductOrder($num, 0, 0, 0, $productId, $uid, $typeId);
+        return ['start_time'=>$tim, 'name'=>$result->name, 'num'=>$num, 'price'=>0];
     }