资产

application/api/controller/Ledger.php

@@ -2,9 +2,7 @@
 
 namespace app\api\controller;
 
-use app\admin\model\LedgerDeclarationChange;
 use app\common\controller\Api;
-use app\common\model\LedgerPowerChangeModel;
 use app\common\model\LedgerQubicChangeModel;
 use app\common\model\UserModel;
 use app\common\model\LedgerSmhChangeModel;
@@ -18,6 +16,7 @@ use think\Log;
 use think\Env;
 use think\Db;
 use fast\Asset;
+use think\Loader ;
 use think\Exception;
 
 /**
@@ -72,16 +71,17 @@ class Ledger extends Api
                 $paginator = (new LedgerUsdtChangeModel());
                 break;
             case 'teac':
-                $paginator = (new LedgerTeacChangeModel());
-                break;
-            case 'declaration':
-                $paginator = (new LedgerDeclarationChange());
-                break;
-            case 'etc':
-                $paginator = (new LedgerTokenChangeModel());
+                $paginator = Loader::model('LedgerTeacChangeModel');
+                $res['data'] = $paginator->where($where)->order('id DESC')->paginate($this->pageSize);
+                $res['statusList'] = $paginator::getStatusList();
                 break;
             case 'token':
-                $paginator = (new LedgerTokenChangeModel());
+                $res['data'] = Loader::model('LedgerTokenChangeModel')->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);
+                $res['statusList'] = LedgerWalletModel::getStatusList();
                 break;
             case 'smh':
                 $paginator = (new LedgerSmhChangeModel());
@@ -93,12 +93,6 @@ class Ledger extends Api
                 $this->error(__('Invalid parameters'));
                 break;
         }
-        $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);
-        $res['statusList'] = $paginator::getStatusList();
         $this->success('',$res);
     }
 

application/api/controller/Pledge.php

@@ -125,7 +125,7 @@ class Pledge extends Api
             Db::startTrans();
             try {
                   // 质抵押订单 
-                  $res = $pledgeLogic::getPledgeCollect($this->auth->id);
+                  $res = $pledgeLogic::getPledgeCollect(1275);
       
                  // 提交事务
                   Db::commit();

application/common/logic/PledgeLogic.php

@@ -123,20 +123,20 @@ class PledgeLogic
         {
             //解冻
             if($item->status == $model::Remove) {
-                $total = $item->total_self;
+                $total += $item->total_self;
                 $item->status = $model::Close; //关闭
             }else{
                 $reta  = bcdiv($item->day_num, $day, 6); //天数
                 $inter = ($item->last_time == 0) ? $time - $item->create_time: $time - $item->last_time; //最后收取时间
-                $total = bcmul($reta, $inter, 6) * $item->num; //累计收益
+                $total += bcmul($reta, $inter, 6) * $item->num; //累计收益
                 $item->last_time = $time; //收取时间
                 $item->total_self= bcadd($total, $item->total_self, 2); //累计收益
             }
-          
-            Loader::model('LedgerWalletModel')->changeWalletAccount($user_id, Asset::TEAC, $item->total_self, LedgerTeacChangeModel::Pledge, 0);
+            //更新领取状态
             $item->save();
         }
-        return true;   
+        //更新用户资产
+        return Loader::model('LedgerWalletModel')->changeWalletAccount($user_id, Asset::TEAC, $total, LedgerTeacChangeModel::Pledge, 0);  
     }
 
     //判断请求限制

application/common/model/LedgerTeacChangeModel.php

@@ -28,7 +28,6 @@ class LedgerTeacChangeModel extends Model
     {
         return [
             self::Pledge => __('质押存储'),
-           
         ];
     }
 

application/common/model/LedgerTokenChangeModel.php

@@ -8,6 +8,8 @@ class LedgerTokenChangeModel extends Model
 {
 
     protected $name = "ledger_token_change";
+
+
     const Payment           = 0;
     const Transfer          = 1;
     const Receive           = 2;
@@ -44,4 +46,7 @@ class LedgerTokenChangeModel extends Model
         ];
     }
 
+
+   
+
 }