冻结茶宝

application/api/controller/Ledger.php

@@ -72,15 +72,15 @@ class Ledger extends Api
         if ($type_id > 0) $where['action'] = $type_id;
         switch ($coin_type){
             case 'token':
-                $paginator = Loader::model('LedgerTokenChangeModel');
-                $res['data'] = $paginator->alias('a')
+                $paginator  = Loader::model('LedgerTokenChangeModel');
+                $res['data']= $paginator->alias('a')
                     ->join('user u', 'a.from_id = u.id and a.action > 9 and a.action < 12', 'LEFT')
                     ->field('a.*, u.address')
                     ->where($where)
                     ->order('a.id DESC')->paginate($this->pageSize);
                 break;
             case 'frozen':
-                $paginator = (new LedgerFrozenChangeModel());
+                $paginator   = (new LedgerFrozenChangeModel());
                 $res['data'] = $paginator->alias('a')
                     ->join('user u', 'a.from_id = u.id and a.action > 2', 'LEFT')
                     ->field('a.*, u.address')

application/common/logic/AirdropLogic.php

@@ -47,21 +47,13 @@ class AirdropLogic
             (new Output())->writeln("本次没有空投发放数据：");
             return false;
         }
-        // 获取指定产品的热门信息
-        $result = ProductPopular::getPopularByTime($info_list['product_id'], 'zh', $info_list->start_time);
-
-        // 检查库存是否足够
-        if(!$result || $info_list->total_num > $result->stock) {
-            // 如果库存不足，输出信息并返回false
-            (new Output())->writeln("本次执行库存不足：");
-            return false;
-        }
+     
    
         // 更新用户福利信息
         WelfareLoginc::setUserExRwaNum(
             $info_list['rwa_num'],
             $info_list['product_id'],  $info_list['rwa_product_id'],
-            $result->is_area,  $result->id, $result->price, 
+            0,  0 , 0, 
             $info_list['rwa_mod'],
             $info_list['num']
         );

application/common/model/LedgerTokenChangeModel.php

@@ -52,10 +52,10 @@ class LedgerTokenChangeModel extends Model
      const Withdraw          = 4;
      const Share             = 5;
      const Return            = 6;
-  
+     const Super             = 7;
      const Direct            = 8;
      const System            = 9;
-     const GiftPay           = 10; //赠送支出
+     const GiftPay           = 10; //赠送支出   
      const GiftReceipt       = 11;
      const Community         = 12; //社区津贴
      const Service           = 13; //服务津贴
@@ -99,6 +99,7 @@ class LedgerTokenChangeModel extends Model
             self::Withdraw  => __('提现'),
             self::Share => __('分享'),
             self::Return => __('退回'),
+            self::Super => __('茶宝标记激活'),
             self::Direct => __('布道津贴'),
             self::System => __('系统调整'),
             self::GiftPay => __('转账支出'),

application/common/model/LedgerWalletModel.php

@@ -170,19 +170,22 @@ class LedgerWalletModel extends Model
             if($available['frozen'] <= $amount) $walletUpdate = ['token' => bcadd($totalAmount, -$amount, 6), 'frozen' => 0];
             //添加冻结
             $newAmount = $walletUpdate['frozen'];
+            // 创建账变记录
+            $ledgerWalletModel->where('user_id', $uid)->update($walletUpdate);
         }else{
 
             if($available->token < $amount) throw new Exception('茶宝不足');
             $newAmount = bcadd($available->frozen, $amount, 6);
+            $chabao =  bcsub($available['token'], $amount, 6);
             //添加冻结
-            $walletUpdate =['token' => bcsub($newAmount, $amount, 6), 'frozen' => bcadd($available->frozen, $amount, 6)];
-        }
-
-        // 创建账变记录
-        $insertRs = $ledgerWalletModel->where('user_id', $uid)->update($walletUpdate);
+            $walletUpdate =['token' => $chabao, 'frozen' =>$newAmount ];
 
+            //添加账变记录
+            $this->changeWalletAccount($uid, Asset::TOKEN, -$amount, LedgerTokenChangeModel::Super, $from_id);
+        }
+        
         // 创建账变记录
-        $insertRs = (new LedgerTokenChangeModel)->insert([
+        $insertRs = (new LedgerFrozenChangeModel())->insert([
             'user_id'        => $uid,
             'from_id'        => $from_id,
             'change_amount'  => $icn.$amount,