commit

app/admin/model/many/ManyOrder.php

@@ -6,6 +6,7 @@
 
 namespace app\admin\model\many;
 
+use app\admin\model\user\UserAddress;
 use crmeb\services\PHPExcelService;
 use crmeb\traits\ModelTrait;
 use crmeb\basic\BaseModel;
@@ -37,7 +38,7 @@ class ManyOrder extends BaseModel
     public static function list($where)
     {
         $model = self::alias('a')
-            ->field('a.*,b.name,u.nickname')
+            ->field('a.*,b.name,u.nickname,u.phone')
             ->order('a.id DESC')
             ->leftJoin('many b', 'b.id = a.many_id')
             ->leftJoin('user u', 'u.uid = a.uid');
@@ -74,6 +75,7 @@ class ManyOrder extends BaseModel
         $list = $model->select()->toArray();
         foreach ($list as &$item)
         {
+            $item['real_name'] = UserAddress::where('uid', $item['uid'])->value('real_name');
             if ($item['return_time'] > 0){
                 $item['return_time'] = date('Y-m-d H:i:s', $item['return_time']);
             }

app/admin/model/user/UserExtract.php

@@ -53,15 +53,19 @@ class UserExtract extends BaseModel
         //待提现金额
         $data['price'] = floatval(self::where('status', 0)->sum('extract_price'));
         //佣金总金额
-        $data['brokerage_count'] = floatval(UserBill::getBrokerageCount());
+        $data['brokerage_count'] = floatval(\app\models\user\User::sum('business_integral'));
         //已提现金额
         $data['priced'] = floatval(self::where('status', 1)->sum('extract_price'));
         //未提现金额
-        $data['brokerage_not'] = bcsub(bcsub($data['brokerage_count'], $data['priced'], 2), $data['price'], 2);
+        $data['brokerage_not'] = floatval(\app\models\user\User::sum('integral'));
         //商品金额
         $data['order_price'] = StoreOrder::where('paid', 1)->sum('pay_price');
         //打怪金额
         $data['many_price'] = ManyOrder::sum('price');
+        //阳光积分
+        $data['user_int'] = floatval(\app\models\user\User::sum('purple_integral'));
+        //打怪金额
+        $data['dfh'] = ManyOrder::where('status', 0)->sum('price');
         return compact('data');
     }
 

app/admin/view/finance/user_extract/index.php

@@ -92,8 +92,8 @@
                     <div class="col-sm-3 ui-sortable">
                         <div class="ibox float-e-margins">
                             <div class="ibox-title">
-                                <span class="label label-success pull-right">待</span>
-                                <h5>佣金总金额</h5>
+                                <span class="label label-danger pull-right">总</span>
+                                <h5>美好积分总额</h5>
                             </div>
                             <div class="ibox-content">
                                 <h1 class="no-margins">{$data.brokerage_count}</h1>
@@ -103,14 +103,36 @@
                     <div class="col-sm-3 ui-sortable">
                         <div class="ibox float-e-margins">
                             <div class="ibox-title">
-                                <span class="label label-success pull-right">待</span>
-                                <h5>未提现金额</h5>
+                                <span class="label label-danger pull-right">总</span>
+                                <h5>商城积分总额</h5>
                             </div>
                             <div class="ibox-content">
                                 <h1 class="no-margins">{$data.brokerage_not}</h1>
                             </div>
                         </div>
                     </div>
+                    <div class="col-sm-3 ui-sortable">
+                        <div class="ibox float-e-margins">
+                            <div class="ibox-title">
+                                <span class="label label-danger pull-right">总</span>
+                                <h5>总阳光积分</h5>
+                            </div>
+                            <div class="ibox-content">
+                                <h1 class="no-margins">{$data.user_int}</h1>
+                            </div>
+                        </div>
+                    </div>
+                    <div class="col-sm-3 ui-sortable">
+                        <div class="ibox float-e-margins">
+                            <div class="ibox-title">
+                                <span class="label label-success pull-right">待</span>
+                                <h5>待返回阳光</h5>
+                            </div>
+                            <div class="ibox-content">
+                                <h1 class="no-margins">{$data.dfh}</h1>
+                            </div>
+                        </div>
+                    </div>
                 </div>
                 <div class="table-responsive">
                     <table class="table table-striped  table-bordered">

app/admin/view/many/many_order/index.php

@@ -191,6 +191,8 @@
             {field: 'id', title: 'ID', sort: true, event: 'id', width: '5%', templet: '#id'},
             {field: 'order_id', title: '订单号',  align: 'center'},
             {field: 'nickname', title: '用户昵称',  align: 'center'},
+            {field: 'real_name', title: '姓名',  align: 'center'},
+            {field: 'phone', title: '电话',  align: 'center'},
             {field: 'name', title: '众筹名称', align: 'center'},
             {field: 'stage', title: '期数',  align: 'center'},
             {field: 'price', title: '金额',  align: 'center'},