茶宝标记

application/api/controller/Airdrop.php

@@ -75,10 +75,10 @@ class Airdrop extends Api
         if((time()-$info->create_time) >= config('super_weal_end_time')) $this->error(__('您已过期'));
         Db::startTrans();
         try {
+            
             //把9.9茶宝转入冻结账号
             if($row->frozen > 0) $ledgerWalletModel->setChangeFrozen($this->auth->id, $row->frozen, LedgerFrozenChangeModel::Super, '+');
             
-
             //添加Rwa茶记录
             $result = WelfareLoginc::setUserWelfareLos($this->auth->id, $row->super_product_id, $row->super_num, time(), $this->lan, $productOrder::Super);
 

application/common/model/LedgerTokenChangeModel.php

@@ -17,7 +17,7 @@ class LedgerTokenChangeModel extends Model
      const Withdraw          = 4;
      const Share             = 5;
      const Return            = 6;
-     const Super             = 7;
+     const Giveaway          = 7; //赠送手续费
      const Direct            = 8;
      const System            = 9;
      const GiftPay           = 10; //赠送支出   
@@ -25,7 +25,7 @@ class LedgerTokenChangeModel extends Model
      const Community         = 12; //社区津贴
      const Service           = 13; //服务津贴
      const Together          = 14; //共创津贴
-   
+     const Super             = 15;
    
      /*
       * 支付状态
@@ -48,8 +48,6 @@ class LedgerTokenChangeModel extends Model
          self::Service           => '服务津贴',
          self::Together          => '共创津贴',
        
-        
-
      ];
 
            
@@ -63,15 +61,15 @@ class LedgerTokenChangeModel extends Model
             self::Withdraw  => __('提现'),
             self::Share => __('分享'),
             self::Return => __('退回'),
-            self::Super => __('茶宝标记激活'),
+            self::Giveaway => __('赠送手续费'),
             self::Direct => __('布道津贴'),
             self::System => __('系统调整'),
             self::GiftPay => __('转账支出'),
             self::GiftReceipt => __('转账收款'),
             self::Community => __('社区津贴'),
             self::Service => __('服务津贴'),
-            self::Together => __('共创津贴')
-       
+            self::Together => __('共创津贴'),
+            self::Super => __('茶宝标记激活')
            ];
     }
    

application/common/model/LedgerWalletModel.php

@@ -161,56 +161,47 @@ class LedgerWalletModel extends Model
         $available = $this->getWallet($uid);
         $ledgerWalletModel  = new LedgerWalletModel();
         if (empty($available)) $ledgerWalletModel->insertGetId(['user_id' => $uid]);  // 创建钱包
-
+        $walletUpdate = [];
+        $result = false;
         //运费/手续费：扣除
-        $totalAmount = bcadd($available['token'], $available['frozen'], 6);
-        if($totalAmount < $amount) throw new Exception('茶宝不足');
-
-        //扣除冻结金额
-        if($available['frozen'] > $amount) $walletUpdate['frozen']  = bcsub($available['frozen'], $amount, 6);
-
-        if($available['frozen'] <= $amount) {
-            //扣除所需茶宝
-            $subAmount = bcsub($amount, $available['frozen'], 6);
-            $walletUpdate = ['token' => bcadd($totalAmount, -$amount, 6), 'frozen' => 0];
-           // 创建茶宝账变记录
-            $insertRs = (new LedgerTokenChangeModel())->insert([
-                'user_id'        => $uid,
-                'from_id'        => $from_id,
-                'change_amount'  => $icn.$subAmount,
-                'present_amount' => bcsub($available['token'], $subAmount, 6),
-                'create_time'    => time(),
-                'action'         => $action
-            ]);
+        if($icn == '-'){
+            $totalAmount = bcadd($available['token'], $available['frozen'], 6);
+            //扣除冻结金额
+            if($available['frozen'] > $amount) $walletUpdate['frozen']  = bcsub($available['frozen'], $amount, 6);
+            if($available['frozen'] <= $amount) {
+                $walletUpdate = ['token'=> bcadd($totalAmount, -$amount, 6), 'frozen' => 0];
+                //添加账变记录
+                $subAmount = bcsub($amount, $available['frozen'], 6);
+                $this->changeWalletAccount($uid, Asset::TOKEN, -$subAmount, LedgerTokenChangeModel::Giveaway, $from_id);
+            }
+            //添加冻结
+            $newAmount = $walletUpdate['frozen'];
+            if($available['frozen'] >  0) $result = true;
+        }
+
+        //手续费
+        if($icn == '+' && $available['frozen'] < $amount){
+            if($available->token < $amount) throw new Exception('茶宝不足');
+            $newAmount = bcadd($available->frozen, $amount, 6);
+            //添加冻结
+            $walletUpdate =['frozen' =>$newAmount];
+            //添加账变记录
+            $this->changeWalletAccount($uid, Asset::TOKEN, -$amount, LedgerTokenChangeModel::Super, $from_id);
+            $result = true;
         }
-  
-        //添加冻结
-        /* if($available->token < $amount) throw new Exception('茶宝不足');
-        $newAmount = bcadd($available->frozen, $amount, 6);
-        $chabao =  bcsub($available['token'], $amount, 6);
-        //添加冻结
-        $walletUpdate =['frozen' =>$newAmount ];
-
-        //添加账变记录
-        $this->changeWalletAccount($uid, Asset::TOKEN, -$amount, LedgerTokenChangeModel::Super, $from_id);
-        */
-
-        $ledgerWalletModel->where('user_id', $uid)->update($walletUpdate);
-
-        // 手续费账变记录
-        if ($available['frozen'] > 0) {
-            $insertRs = (new LedgerFrozenChangeModel())->insert([
+      
+        // 创建账变记录
+        if (count($walletUpdate) > 0) $ledgerWalletModel->where('user_id', $uid)->update($walletUpdate);
+        if($result){
+            return (new LedgerFrozenChangeModel())->insert([
                 'user_id'        => $uid,
                 'from_id'        => $from_id,
                 'change_amount'  => $icn.$amount,
-                'present_amount' => $walletUpdate['frozen'],
+                'present_amount' => $newAmount,
                 'create_time'    => time(),
                 'action'         => $action
             ]);
         }
-        if (empty($insertRs)) {
-            throw new Exception('创建账变记录失败');
-        }
     }
 
     /**

public/assets/js/backend/ledger/ledger_token_change.js

@@ -40,7 +40,7 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
                                 4: '充值',
                                 5: '分享',
                                 6: '提现退回',
-                                7: '茶宝标记激活',
+                                7: '赠送手续费',
                                 8: '布道津贴',
                                 9: '系统调整',
                                 10: '赠送支出',
@@ -48,7 +48,7 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
                                 12: '社区津贴',
                                 13: '服务津贴',
                                 14: '共创津贴',
-                       
+                                15: '茶宝标记激活'
                             }, operate: 'FIND_IN_SET', formatter: Table.api.formatter.label
                         },
                     ]