理财

app/admin/view/finance/finance/cash_trade.php

@@ -121,11 +121,12 @@
             {field: '_user', title: '交易发起人'},
             {field: '_trade_user', title: '交易参与人'},
             {field: '_trade_type', title: '挂出类型'},
-            {field: 'money_num', title: '币额', width: '10%'},
-            {field: 'money_type', title: '币种', width: '10%'},
+            {field: 'money_num', title: '币额'},
+            {field: 'all_price', title: '金额'},
+            {field: 'money_type', title: '币种'},
             {field: '_status', title: '状态', width: '10%'},
-            {field: 'bank', title: '收款方式', toolbar: '#bank', width: '10%'},
-            {field: 'time', title: '时间', toolbar: '#time', width: '10%'},
+            {field: 'bank', title: '收款方式', toolbar: '#bank', width: '15%'},
+            {field: 'time', title: '时间', toolbar: '#time', width: '15%'},
             {
                 field: 'proof',
                 title: '交易凭证',

app/admin/view/index/main.php

@@ -75,7 +75,7 @@
                 </div>
                 <div class="ibox-content">
                     <h1 class="no-margins">{$topData.treatedSite}</h1>
-                    <small><a href="javascript:;" class="opFrames" data-name="平台订单" data-href="{:Url('finance.finance/cashTrade')}">待处理充值</a></small>
+                    <small><a href="javascript:;" class="opFrames" data-name="平台订单" data-href="{:Url('finance.finance/cashTrade')}">待处理交易</a></small>
                 </div>
             </div>
         </div>

app/api/controller/user/UserController.php

@@ -782,6 +782,7 @@ class UserController
         $money_type = sys_data('money_type');
         $back = [];
         $like_rmb = 0;
+        $like_usdt = 0;
 //        foreach ($money_type as $v) {
 //            unset($v['cash_commission_ratio']);
 //            unset($v['cash_commission_type']);
@@ -817,6 +818,7 @@ class UserController
                     $back[$k]['up'] = $vv['up'];
                     $back[$k]['rmb'] = bcmul($back[$k]['money']['money'], $back[$k]['price'], 2);
                     $like_rmb += $back[$k]['rmb'];
+                    $like_usdt += $back[$k]['usdt'];
                 }
             }
 
@@ -834,8 +836,6 @@ class UserController
 //            $back[$k]['rmb'] = bcmul($back[$k]['money']['money'], $back[$k]['price'], 2);
 //            $like_rmb += $back[$k]['rmb'];
         }
-        $like_usdt = 0;
-        if (isset($usdt_price) && $usdt_price > 0) $like_usdt = bcdiv($like_rmb, $usdt_price, 8);
         return app('json')->success('ok', compact('back', 'like_rmb', 'like_usdt'));
     }
 

app/models/user/UserBill.php

@@ -162,7 +162,7 @@ class UserBill extends BaseModel
                 $model = $model->where('type', 'in', 'recharge,system_add');
                 break;
             case 3:
-                $model = $model->where('type', 'brokerage')->whereOr('type', 'recharge');
+                $model = $model->where('type', 'return_uper');
                 break;
             case 4:
                 $model = $model->where('type', 'extract')->whereOr('type', 'recharge');