edit

service/agent/lib/Tool.php

@@ -871,6 +871,8 @@ class Tool
                 if ($v['parent_order_num']) {
                     $order = Dever::db('agent/order')->find(array('order_num' => $v['parent_order_num']));
                     if ($order) {
+                        $w = array();
+                        $w['clear'] = true;
                         $w['order_id'] = $order['id'];
                         $w['type'] = $v['type'];
                         $w['type_id'] = $v['type_id'];
@@ -894,4 +896,18 @@ class Tool
 
         return 'ok';
     }
+
+    # 导出没有合同的代理商
+    public function daili_api()
+    {
+        $data = Dever::db('agent/order')->fetchAll('select sign from churen_agent_order where sign is null');
+
+        $head = array('商品名', '数量', '价格');
+        $body = array();
+
+        print_r($data);die;
+
+        $file = '未签合同代理商';
+        return Dever::excelExport($body, $head, $file);
+    }
 }

service/option/database/cash.php

@@ -4,8 +4,11 @@ $type = array
 (
     1 => '期权账户',
     2 => '原始期权账户',
+    3 => '岗位期权账户',
+    4 => '奖励期权账户',
 );
 
+
 return array
 (
     # 表名

service/option/database/member.php

@@ -18,6 +18,12 @@ $idcard_bind = array
     2 => '身份证未绑定',
 );
 
+$role = array
+(
+    1 => '代理商',
+    2 => '公司员工',
+);
+
 $search_auth = Dever::input('search_option_dever_auth', 1);
 
 $list_button = array();
@@ -159,6 +165,16 @@ return array
             'option'    => $idcard_bind,
         ),
 
+        'role'        => array
+        (
+            'type'      => 'int-11',
+            'name'      => '角色',
+            'default'   => '1',
+            'desc'      => '角色',
+            'match'     => 'is_numeric',
+            'option'    => $role,
+        ),
+
         'status'        => array
         (
             'type'      => 'tinyint-1',