commit

app/admin/controller/finance/UserExtract.php

@@ -218,6 +218,11 @@ class UserExtract extends AuthController
             if ($item['status'] == 0) $status = '审核中';
             if ($item['status'] == 1) $status = '已提现';
             if ($item['status'] < 0) $status = '未通过';
+            if ($item['type'] == 1){
+                $type = '静态';
+            }else{
+                $type = '动态';
+            }
 
 
             $export[] = [
@@ -231,11 +236,12 @@ class UserExtract extends AuthController
                 $item['bank_address'],
                 $item['bank_belonging'],
                 $status,
+                $type,
                 $item['fail_msg'],
                 date('Y-m-d H:i:s', $item['add_time'])
             ];
         }
-        PHPExcelService::setExcelHeader(['UID', '用户昵称', '姓名','手机号', '提现金额', '提现方式','微信|支付宝|银行卡', '银行卡地址','所属支行名称', '状态',
+        PHPExcelService::setExcelHeader(['UID', '用户昵称', '姓名','手机号', '提现金额', '提现方式','微信|支付宝|银行卡', '银行卡地址','所属支行名称', '状态', '类型',
             '未通过原因', '提现时间'])
             ->setExcelTile('提现导出' . date('YmdHis', time()), '提现信息' . time(), ' 生成时间：' . date('Y-m-d H:i:s', time()))
             ->setExcelContent($export)
@@ -363,7 +369,7 @@ class UserExtract extends AuthController
             if ($extract->is_examine > 1) return JsonService::fail('该记录已审核');
             $extract['is_examine'] = 2;
             $extract['reviewed'] = $extract['reviewed'].','.$admin['real_name'];
-        }elseif ($admin['roles'] == 3){
+        }elseif ($admin['roles'] == 8){
             if ($extract->examine_status > 0) return JsonService::fail('该记录已审核');
             $extract['examine_status'] = 1;
             $extract['reviewed'] = $extract['reviewed'].','.$admin['real_name'];

app/admin/controller/order/StoreOrder.php

@@ -961,7 +961,7 @@ class StoreOrder extends AuthController
             if ($order->is_examine > 1) return JsonService::fail('该记录已审核');
             $order['is_examine'] = 2;
             $order['reviewed'] = $order['reviewed'].','.$admin['real_name'];
-        }elseif (in_array(3, $roles)){
+        }elseif (in_array(8, $roles)){
             if ($order->examine_status > 0) return JsonService::fail('该记录已审核');
             $order['examine_status'] = 1;
             $order['reviewed'] = $order['reviewed'].','.$admin['real_name'];

app/admin/view/finance/finance/bill.php

@@ -131,6 +131,16 @@
                 </div>
             </div>
         </div>
+        <div class="layui-col-md12">
+            <div class="layui-card">
+                <div class="layui-card-body">
+                    <table class="layui-hide" id="userList" lay-filter="userList"></table>
+                    <script type="text/html" id="balance">
+                        <span style="color:#009688">{{d.balance}}</span>
+                    </script>
+                </div>
+            </div>
+        </div>
     </div>
 </div>
 <script src="{__ADMIN_PATH}js/layuiList.js"></script>

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

@@ -100,6 +100,7 @@
                                 <th class="text-center">提现金额</th>
                                 <th class="text-center">提现方式</th>
                                 <th class="text-center">添加时间</th>
+                                <th class="text-center">类型</th>
                                 <th class="text-center">备注</th>
                                 <th class="text-center">审核状态</th>
                                 <th class="text-center">审核进度</th>
@@ -137,6 +138,13 @@
                             <td class="text-center">
                                 {$vo.add_time|date='Y-m-d H:i:s'}
                             </td>
+                            <td class="text-center">
+                                {if condition="$vo['type'] eq 1"}
+                                静态
+                                {elseif condition="$vo['type'] eq 2"}
+                                动态
+                                {/if}
+                            </td>
                             <td class="text-center">
                                 {$vo.mark}
                             </td>

app/api/controller/user/UserBillController.php

@@ -75,9 +75,9 @@ class UserBillController
         ], $request);
         $uid = $request->uid();
         $data['list'] = User::getUserSpreadGrade($uid, $spreadInfo['grade'], $spreadInfo['sort'], $spreadInfo['keyword'], $spreadInfo['page'], $spreadInfo['limit']);
-        $data['total'] = User::getSpreadCount($uid);
         $user = User::select();
         $uid = get_downlines($user, $uid);
+        $data['total'] = count(get_downline($user, $uid));
         $data['totalLevel'] = User::where('uid', 'in', $uid)->count();
         $data['order_count'] = StoreOrder::where('uid', 'in', $uid)->where('paid', 1)->sum('pay_price');// 团队总业界
         return app('json')->successful($data);

app/models/user/UserExtract.php

@@ -66,6 +66,7 @@ class UserExtract extends BaseModel
             $c = 'integral';
             $t = 'extract_integral';
         }elseif ($data['type'] == 2){
+            return self::setErrorInfo('动态积分暂不能提现');
             $extractPrice = $userInfo['dynamic_integral'];
             $str = '动态积分';
             $c = 'dynamic_integral';
@@ -86,7 +87,7 @@ class UserExtract extends BaseModel
         $insertData = [
             'uid' => $userInfo['uid'],
             'extract_type' => $data['extract_type'],
-            'extract_price' => $data['type'] == 1? ($data['money'] - ($data['money'] * $charge)) -2 :(($data['money'] * $re_integral) - ($data['money'] * $charge)) -2 ,
+            'extract_price' => $data['type'] == 1? ($data['money'] - ($data['money'] * $charge)) -2 :(($data['money'] * $re_integral) - ($data['money'] * $re_integral * $charge)) -2 ,
             'add_time' => time(),
             'balance' => $balance,
             'status' => self::AUDIT_STATUS,