直推升级

application/admin/controller/general/Announcement.php

@@ -24,7 +24,7 @@ class Announcement extends Backend
     {
         parent::_initialize();
         $this->model = new \app\common\model\AnnouncementModel;
-        $this->view->assign("typeList", $this->model ::getTypeList());
+        $this->view->assign("typeList", $this->model::getTypeList());
     }
 
     /**

application/api/controller/Airdrop.php

@@ -43,18 +43,17 @@ class Airdrop extends Api
     {
         $row = $userWelfare::getIsWelfare();
         if(empty($row->is_newbie)) $this->error(__('暂未开启'));
-        $user = $userModel->getById($this->request->post('uid')); //测试用户
-        $info = $productOrder::getUserWelfare($user->id, $productOrder::Newbie);
+      
+        $info = $productOrder::getUserWelfare($this->auth->id, $productOrder::Newbie);
         if(!empty($info)) $this->error(__('您已领取'));
         Db::startTrans();
         try {
             
-
             //添加Rwa茶记录
-            $result = WelfareLoginc::setUserWelfareLos($user->id, $row->new_product_id, $row->new_num, time(), $this->lan, $productOrder::Newbie);
+            $result = WelfareLoginc::setUserWelfareLos($this->auth->id, $row->new_product_id, $row->new_num, time(), $this->lan, $productOrder::Newbie);
 
             //修改标识
-            $userModel::where('id', $user->id)->update(['is_super'=> $userModel::NewPeo]);
+            $userModel::where('id', $this->auth->id)->update(['is_super'=> $userModel::NewPeo]);
             Db::commit();
         } catch (\Exception $e) {
             Db::rollback();
@@ -69,32 +68,31 @@ class Airdrop extends Api
     public function setSuperWeal(UserWelfare $userWelfare, UserModel $userModel, ProductOrder $productOrder, LedgerWalletModel $ledgerWalletModel)
     {
         $row = $userWelfare::getIsWelfare();
-        $user = $userModel->getById($this->request->post('uid')); //测试用户
         if(empty($row->is_super)) $this->error(__('暂未开启'));
-        if($user->is_super != $userModel::NewPeo) $this->error(__('您已领取'));
+        if($this->auth->is_super != $userModel::NewPeo) $this->error(__('您已领取'));
 
         //判断距离领取新人福利是否超过一天
-        $info = $productOrder::getUserWelfare($user->id, $productOrder::Newbie);
+        $info = $productOrder::getUserWelfare($this->auth->id, $productOrder::Newbie);
         if((time()-$info->create_time) >= config('super_weal_end_time')) $this->error(__('您已过期'));
         Db::startTrans();
         try {
             
             //把9.9茶宝转入冻结账号
-            if($row->frozen > 0) $ledgerWalletModel->setChangeFrozen($user->id, $row->frozen, LedgerFrozenChangeModel::Super, '+');
+            if($row->frozen > 0) $ledgerWalletModel->setChangeFrozen($this->auth->id, $row->frozen, LedgerFrozenChangeModel::Super, '+');
             
             //添加Rwa茶记录
-            $result = WelfareLoginc::setUserWelfareLos($user->id, $row->super_product_id, $row->super_num, time(), $this->lan, $productOrder::Super);
+            WelfareLoginc::setUserWelfareLos($this->auth->id, $row->super_product_id, $row->super_num, time(), $this->lan, $productOrder::Super);
 
             //添加超级福利标识/上级
-            $userModel::updateUserLevel($user->id, $user->parent_id, $user->address_level);
+            $userModel::updateUserLevel($this->auth->id, $this->auth->parent_id, $this->auth->address_level);
 
             //插入待空投记录
-            $rs = UserAirdrop::insert([
-                'user_id'       =>  $user->id,
+            $result = UserAirdrop::insert([
+                'user_id'       =>  $this->auth->id,
                 'type_id'       =>  UserAirdrop::TypeSuperWeal,
                 'product_id'    =>  $row->super_product_id,
                 'num'           =>  $row->super_num,
-                'address'       =>  $user->address,
+                'address'       =>  $this->auth->address,
                 'remark'        =>  '超级福利空投',
                 'create_time'   =>time(),
                 'status'        =>UserAirdrop::Normal,//为0 待发放层级奖励

application/api/controller/Announcement.php

@@ -22,7 +22,7 @@ class Announcement extends Api
     //获取大分类
     public function gettype(AnnouncementModel $announcementModel){
 
-        $this->success('', $announcementModel::getTypeList($this->lan));
+        $this->success('', $announcementModel::getTypeAllList($this->lan));
     }
 
 

application/api/logic/WelfareLoginc.php

@@ -153,7 +153,7 @@ class WelfareLoginc
     public static function setUserEcologyAirdrop(int $uid, int $productId): bool
     {
         $ecology = config('ecology');
-        if($ecology['product_id'] != $productId){
+        if(!in_array($productId, $ecology['product_id'])){
             return true;
         }
         $user = Loader::model('UserModel')->getById($uid);

application/common/model/AnnouncementModel.php

@@ -45,8 +45,13 @@ class AnnouncementModel  extends Model
         return $row->save();
     }
 
+    public static function getTypeList()
+    {   
+        return [1 => __('官方公告'), 2 => __('系统信息'), 3 => __('茶说'), 4 => __('新闻中心')];
+  
+    }
 
-    public static function getTypeList(string $lan)
+    public static function getTypeAllList(string $lan)
     {   
         $typeList = [['key'=>1, 'value' => __('官方公告')], ['key'=>4,'value' => __('新闻中心')]];
         foreach ($typeList as &$item) {

application/common/model/UserModel.php

@@ -31,7 +31,7 @@ class UserModel extends Model
     const Normal         = 1;
     const Stop           = 2;
 
-    const LevelConta     = [1=>2, 2=>9,  3=>2, 4=>2];  //包含自己
+    const LevelConta     = [1=>2, 2=>9,  3=>3, 4=>3];  //包含自己
     const LevelAll       = [1=>3, 2=>10, 3=>3, 4=>3];  //直推人数
 
     const LevelOne       = 1; //青铜
@@ -127,11 +127,10 @@ class UserModel extends Model
                 $parent = self::where('id', $item)->find();
                 //更新等级
                 if ($parent->address_level < self::LevelFive) {
-                
                     //升级条件
                     $level = ($parentId == $item)? self::LevelConta: self::LevelAll;
                     //升级
-                    if($parent->address_level == self::LevelThre){
+                    if($parent->address_level < self::LevelThre){
                         $parentCount = self::where('parent_id', $item)->where('is_super', '=', self::Super)->count();
                         if($parentCount >= $level[1]) $parent->address_level = self::LevelTwo;
                         if($parentCount >= $level[2]) $parent->address_level = self::LevelThre;
@@ -146,7 +145,7 @@ class UserModel extends Model
                     }
                 }
                 //更新直推领取人数
-                if($parentId == $item) $parent->direct_super +=  self::Normal;
+                if($parentId == $item) $parent->direct_super += self::Normal;
                 $parent->save();
             }
         }

application/config.php

@@ -379,7 +379,7 @@ return [
     ],
     //生态节点推广
     'ecology' => [
-        'product_id'    => 17,//购买指定产品
+        'product_id'    => [17, 52],//购买指定产品
         //空投产品与数量
         'airdrop' => [
             0 => ['product_id'=>27, 'num'=>1],  //1.茶世通宝1套（ID 27）