用户空投：

application/api/command/SenAirdrop.php

@@ -27,9 +27,9 @@ class SenAirdrop extends Command
 
         $teamRewards = new AirdropLogic();
 
-        $output->writeln('向指定用户空投：' . date('Y-m-d H:i:s', time()));
+        $output->writeln('用户空投：' . date('Y-m-d H:i:s', time()));
         $teamRewards->setAirdropRewards();
-        $output->writeln('向指定用户空投结束：' . date('Y-m-d H:i:s', time()));
+        $output->writeln('用户空投结束：' . date('Y-m-d H:i:s', time()));
 
         $output->writeln('层级奖励空投：' . date('Y-m-d H:i:s', time()));
         $teamRewards->setParentRewards();

application/api/logic/WelfareLoginc.php

@@ -156,7 +156,7 @@ class WelfareLoginc
         if($ecology['product_id'] != $productId){
             return true;
         }
-        $user = UserModel::getById($uid);
+        $user = Loader::model('UserModel')->getById($uid);
         if($user->is_ecology) return true;
         //空投产品
         if($ecology['airdrop']){
@@ -165,13 +165,16 @@ class WelfareLoginc
                 $userAirdrop::create([
                     'user_id'       =>  $uid,
                     'type_id'       =>  UserAirdrop::TypeUser,
-                    'product_id'    =>  $item->product_id,
-                    'num'           =>  $item->num,
-                    'remark'        =>  '超级福利空投',
+                    'product_id'    =>  $item['product_id'],
+                    'num'           =>  $item['num'],
+                    'total_num'     =>  $item['num'],
+                    'remark'        =>  '生态节点空投',
                     'status'        =>UserAirdrop::Normal,//为0 待发放层级奖励
                 ]);
             }
         }
+
+   
         //发放标记茶宝
         Loader::model('LedgerWalletModel')->changeWalletAccount($uid, Asset::FROZEN, $ecology['frozen'], LedgerFrozenChangeModel::Ecology, 0);
 

application/common/logic/AirdropLogic.php

@@ -43,22 +43,28 @@ class AirdropLogic
     public function setAirdropRewards()
     {
         //查找会员资产列表
-        $info_list = UserAirdrop::where('type_id', UserAirdrop::TypeRwa)->where('status', UserAirdrop::Normal)->find();    
+        $info_list = UserAirdrop::where('type_id', '<=' , UserAirdrop::TypeRwa)->where('status', UserAirdrop::Normal)->find();    
         if(empty($info_list)){
             (new Output())->writeln("本次没有空投发放数据：");
             return false;
         }
-     
+        
+        //向固定用户空投
+        if($info_list->type_id == UserAirdrop::TypeUser){
+            WelfareLoginc::setUserProductOrder($info_list->num, 0, 0, 0, $info_list->product_id, $info_list->user_id, ProductOrder::Airdrop);
+        }else{
+            // 向超过Rwa数空投
+            WelfareLoginc::setUserExRwaNum(
+                $info_list['rwa_num'],
+                $info_list['product_id'],  
+                $info_list['rwa_product_id'],
+                0,  $info_list->id , 0, 
+                $info_list['rwa_mod'],
+                $info_list['num']
+            );
+        }
    
-        // 更新用户福利信息
-        WelfareLoginc::setUserExRwaNum(
-            $info_list['rwa_num'],
-            $info_list['product_id'],  
-            $info_list['rwa_product_id'],
-            0,  $info_list->id , 0, 
-            $info_list['rwa_mod'],
-            $info_list['num']
-        );
+    
 
         // 更新信息列表的状态和备注
         $info_list->status = UserAirdrop::Stop;