edit

service/mail/lib/Manage.php

@@ -578,7 +578,7 @@ class Manage
     public function out_option_qiquan_api($data)
     {
         // print_R($data);die;
-        $header = array('索引', '账户名称', '账户类型', '手机号', '邮箱', '邮箱认证', '账户认证', '合同审核状态','待交付', '已交付', '发放',  '兑付');
+        $header = array('索引', '账户名称', '账户类型', '手机号', '邮箱', '邮箱认证', '账户认证', '合同审核状态','待交付期权', '待交付原始期权', '已交付期权', '已交付原始期权');
         // $data = Dever::db('option/member')->state();
         $body = array();
         $main = '';
@@ -602,10 +602,7 @@ class Manage
         }
         foreach ($member as $k => $v1) {
             foreach ($v1 as $v) {
-                $f_money = 0;
-                $j_money = 0;
-                $dj_money = 0;
-                $d_money = 0;
+                $daijiaofu_qiquan = $daijiaofu_yuanshiqiquan = $jiaofu_qiquan = $jiaofu_yaunshiqiquan = 0;
                 if ($v['main'] == 1) {
                     $main = '主账户';
                 } else {
@@ -613,6 +610,7 @@ class Manage
                 }
                 $where = array();
                 $where['mid'] = $v['id'];
+                /*
                 $ff = Dever::db('option/bill_fafang')->getSearch($where);
                 if ($ff && $ff['total']) {
                     $f_money = $ff['total'];
@@ -621,16 +619,32 @@ class Manage
                 if ($duifu && $duifu['total']){
                     $d_money = $duifu['total'];
                 }
+                */
 
                 $where['status'] = 1;
+                $where['type'] = 1;
                 $jiaofu = Dever::db('option/bill_jiaofu')->getSearch($where);
                 if ($jiaofu && $jiaofu['total']){
-                    $j_money = $jiaofu['total'];
+                    $daijiaofu_qiquan = $jiaofu['total'];
                 }
+                $where['status'] = 1;
+                $where['type'] = 2;
+                $jiaofu = Dever::db('option/bill_jiaofu')->getSearch($where);
+                if ($jiaofu && $jiaofu['total']){
+                    $daijiaofu_yuanshiqiquan = $jiaofu['total'];
+                }
+                $where['status'] = 2;
+                $where['type'] = 1;
+                $jiaofu = Dever::db('option/bill_jiaofu')->getSearch($where);
+                if ($jiaofu && $jiaofu['total']){
+                    $jiaofu_qiquan = $jiaofu['total'];
+                }
+
                 $where['status'] = 2;
+                $where['type'] = 2;
                 $jiaofu = Dever::db('option/bill_jiaofu')->getSearch($where);
                 if ($jiaofu && $jiaofu['total']){
-                    $dj_money = $jiaofu['total'];
+                    $jiaofu_yaunshiqiquan = $jiaofu['total'];
                 }
                 
                 $d =array
@@ -644,10 +658,10 @@ class Manage
                     $status[$v['aid']]['audit'],
                     $status[$v['aid']]['agreement'],
                     
-                    $dj_money,
-                    $j_money,
-                    $f_money,
-                    $d_money,
+                    $daijiaofu_qiquan,
+                    $daijiaofu_yuanshiqiquan,
+                    $jiaofu_qiquan,
+                    $jiaofu_yaunshiqiquan,
                 );
                 $body[] = $d;
             }

service/option/database/bill_jiaofu.php

@@ -385,6 +385,7 @@ return array
             (
                 'mid' => 'yes',
                 'aid' => 'yes',
+                'type' => 'yes',
                 'status' => 'yes',
                 'state' => 1,
             ),