teac天使转

application/api/controller/Ledger.php

@@ -18,7 +18,6 @@ use think\Db;
 use fast\Asset;
 use think\Loader ;
 use think\Exception;
-
 /**
  * 首页接口
  */
@@ -78,8 +77,53 @@ class Ledger extends Api
      */
     public function coinList()
     {
+
         $type_id  = $this->request->post('query.action'); // 账变类型
         $coin_type  = $this->request->post('query.coin_type'); // 資金类型
+        
+        $where = ['user_id' => $this->auth->id];
+        if ($type_id > 0) $where['action'] = $type_id;
+        switch ($coin_type){
+            case 'token':
+                $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());
+                $res['data'] = $paginator->alias('a')
+                    ->join('user u', 'a.from_id = u.id and a.action > 2', 'LEFT')
+                    ->field('a.*, u.address')
+                    ->where($where)
+                    ->order('id DESC')->paginate($this->pageSize);
+                break;
+            case 'teac':
+                $paginator = Loader::model('LedgerTeacChangeModel');
+                $res['data'] = $paginator->where($where)->order('id DESC')->paginate($this->pageSize);
+                break;
+            case 'teac_angel':
+                $paginator = (new LedgerTeacAngelChangeModel());
+                $res['data'] = $paginator->where($where)->order('id DESC')->paginate($this->pageSize);
+                break;
+            case 'teac_ecology':
+                $paginator = (new LedgerTeacEcolyChangeModel());
+                $res['data'] = $paginator->where($where)->order('id DESC')->paginate($this->pageSize);
+                break;
+            default:
+                $this->error(__('Invalid parameters'));
+                break;
+        }
+        $res['statusList'] = $paginator::getStatusList();
+        $this->success('',$res);
+    }
+
+    public function getCoinList($type_id,$coin_type)
+    {
+
+        
         $where = ['user_id' => $this->auth->id];
         if ($type_id > 0) $where['action'] = $type_id;
         switch ($coin_type){
@@ -277,7 +321,8 @@ class Ledger extends Api
             // 更新USDT和账变
             $ledgerWalletModel->changeWalletAccount($this->auth->id, Asset::TEAC_ANGEL, -$amount, LedgerTeacAngelChangeModel::GiftPay, $user['id']);
             
-            $ledgerWalletModel->changeWalletAccount($user['id'], Asset::TEAC_ANGEL, $real, LedgerTeacChangeModel::GiftReceipt, $this->auth->id);
+            $re=$ledgerWalletModel->changeWalletAccount($user['id'], Asset::TEAC_ANGEL, $real, LedgerTeacAngelChangeModel::GiftReceipt, $this->auth->id);
+          
             // 提交事务
             Db::commit();
         } catch (Exception $e) {
@@ -285,7 +330,7 @@ class Ledger extends Api
             Db::rollback();
             $this->error($e->getMessage(), null, $e->getCode());
         }
-        $this->getGiftDesc();
+        $this->success('ok');
     }
 
     

application/common/model/LedgerTeacAngelChangeModel.php

@@ -10,55 +10,35 @@ class LedgerTeacAngelChangeModel extends Model
     protected $name = "ledger_teac_angel_change";
 
 
-   //0支付 1转让支付 2 转让收款 3 充值 4 提现 5扣除书续费
-    const Pledge           = 0;
+    //0茶付宝转入
+    const TransferIn       = 0;
     const Sell             = 1;
-    const SellBuy          = 2;
-    const Buying           = 3;
-    const BuySell          = 4;
-    const SellCancel       = 5;
-    const Exchange         = 6;
-    const PledgeFee        = 7; //存储服务费
-    const TeamLevel        = 8; //等级分佣
-    const GiftPay          = 9; //赠送支付
-    const GiftReceipt      = 10; //赠送收款
-    const System           = 100; //系统调整
+    const GiftPay          = 2; //赠送支付
+    const GiftReceipt      = 3; //赠送收款
+    
     /*
      * 支付状态
      * 0未支付 100支付中 200支付成功 400支付失败
      */
     public $pay_status = [
         '-1'                   => '全部',
-        self::Pledge           => '质押存储',
-        self::Sell             => 'C2C出售',
-        self::SellBuy          => 'C2C出售购买',
-        self::Buying           => 'C2C求购',
-        self::BuySell          => 'C2C求购出售',
-        self::SellCancel       => 'C2C取消出售',
-        self::Exchange         => 'Teac兑换',
-        self::PledgeFee        => '存储服务费',
-        self::TeamLevel        => '社区服务奖励',
-        self::System           => '系统调整',
+        self::TransferIn       => '茶付宝划转',
         self::GiftPay          => '赠送支付',
         self::GiftReceipt      => '赠送收款',
+       
+    
     ];
 
     //getStatusList
     public static function getStatusList()
     {
         return [
-            self::Pledge    => __('质押存储'),
-            self::Sell      => __('C2C出售'),
-            self::SellBuy   => __('C2C出售购买'),
-            self::Buying    => __('C2C存储'),
-            self::BuySell   => __('C2C存储出售'),
-            self::SellCancel   => __('C2C取消出售'),
-            self::Exchange     => __('C2C兑换产品'),
-            self::PledgeFee    => __('存储服务费'),
-            self::TeamLevel    => __('社区服务奖励'),
+            self::TransferIn    => __('茶付宝划转'),
             self::GiftPay      => __('赠送支付'),
             self::GiftReceipt  => __('赠送收款'),
-            self::System       => __('系统调整'),
+         
         ];
     }
+
+    
 }

application/common/model/LedgerWalletModel.php

@@ -100,6 +100,7 @@ class LedgerWalletModel extends Model
                 break;
             case Asset::TEAC_ANGEL:
                 $changeModel = new LedgerTeacAngelChangeModel();
+                break;
             case Asset::TEAC_ECOLY:
                 $changeModel = new LedgerTeacEcolyChangeModel();
                 break;