rabin 3 년 전
부모
커밋
579f696b1f
3개의 변경된 파일44개의 추가작업 그리고 24개의 파일을 삭제
  1. 2 2
      config/env/localhost/default.php
  2. 8 6
      service/agent/database/order.php
  3. 34 16
      service/agent/lib/Member.php

+ 2 - 2
config/env/localhost/default.php

@@ -10,9 +10,9 @@ if (is_file($dc_file)) {
 $config['base'] = array
 (
     # api文档生成是否开启,开启后,将会根据访问来生成文档。生产环境建议禁止
-    'apiDoc' => true,
+    'apiDoc' => false,
     # api日志是否开启,开启后,将会记录所有带有_api后缀方法的请求参数和响应参数
-    'apiLog' => true,
+    'apiLog' => false,
 
     # 定义自动转为api的目录,可以将该目录下的所有类的公共方法,都转为可以访问的api,开启该功能可能有安全性问题。
     'apiOpenPath' => 'src',

+ 8 - 6
service/agent/database/order.php

@@ -260,7 +260,7 @@ return array
                 'col' => 'mobile',
                 'result' => 'id',
             ),
-            'list_name'      => '邀请人',
+            'list_name'      => '上级信息',
             'list'      => 'Dever::load("agent/lib/member.getOne", {parent_mid})',
             'list_order' => 4,
             
@@ -290,8 +290,8 @@ return array
             'match'     => 'is_string',
             'update'    => 'text',
             'search'    => 'fulltext',
-            'list'      => 'Dever::load("agent/lib/order.new_set",{id})',
-            // 'Dever::load("agent/lib/member.getOne", {id}, "agent/order")',
+            'list_name' => '代理信息',
+            'list'      => 'Dever::load("agent/lib/member.getOne", {id}, "agent/order", true)',
             'list_order' => 3,
         ),
 
@@ -350,8 +350,10 @@ return array
             'match'     => 'option',
             'update'    => 'text',
             // 'list'		=> true,
-            'list_name' => '应付金额<br />实付金额<br />代理费<br />软件服务费<br />',
-            'list'      =>'Dever::load("agent/lib/order.set_price", {id})',
+            //'list_name' => '应付金额<br />实付金额<br />代理费<br />软件服务费<br />',
+            'list_name' => '实付金额',
+            'list'      => true,
+            //'list'      =>'Dever::load("agent/lib/order.set_price", {id})',
             'list_order' => 10,
         ),
 
@@ -451,7 +453,7 @@ return array
             'match'     => 'is_string',
             'match'     => Dever::rule('idcard'),
             'update'    => 'text',
-            'search'	=> 'fulltext',
+            //'search'	=> 'fulltext',
         ),
 
         'idcard_front'     => array

+ 34 - 16
service/agent/lib/Member.php

@@ -6,21 +6,25 @@ use Dever;
 
 class Member
 {
-    public function getOne($id, $table = 'agent/member')
+    public function getOne($id, $table = 'agent/member', $area = false)
     {
         if ($id < 0) {
             return '无';
         }
         $member = Dever::db($table)->find($id);
         if ($member) {
+            if (isset($member['mid'])) {
+                $member['id'] = $member['mid'];  
+            }
+
             $member['role'] = Dever::db('setting/role')->find($member['role']);
-            $url = Dever::url('project/database/list?project=agent&table=member_area&mid='.$member['id'].'&page_type=1&[refer]', 'manage');   
+            $url = Dever::url('project/database/list?project=agent&table=member_area&mid='.$member['id'].'&page_type=1&[refer]', 'manage');
             
             $member['name'] = '<a href="'.$url.'">' . $member['name'] . '</a>';
             $code = Dever::load("invite/api.code", $member['id']);
             $string = '';
             if ($code) {
-                $string = '[' . $code . ']<br />';
+                $string = '[' . $code . '] <br />';
             }
 
             $string .= $member['name'] . '<br />' . $member['mobile'] . '<br />' . $member['role']['name'];
@@ -29,9 +33,23 @@ class Member
                 $member['level'] = Dever::db('setting/level')->find($member['level_id']);
                 $string .= '('.$member['level']['name'].')';
             }
-            $source=Dever::db('setting/source')->one(array('id'=>$member['source_id'],'state'=>1));
-            if($source){
-                $string .= '<br/>'.$source['name'];
+
+            if ($area) {
+                $area = Dever::load("area/api.string", $member['area']);
+                if ($area) {
+                    $string .= '<br/>' . $area;
+                }
+            }
+
+            $url = Dever::url('project/database/list?project=agent&table=member&search_option_parent_mid='.$member['id'].'&[refer]', 'manage');
+
+            $string .= '<br/><a href="'.$url.'">直推:'. Dever::load("invite/api")->getChildNum($member['id'], 1) . '</a>';
+
+            if ($member['source_id'] > 0) {
+                $source = Dever::db('setting/source')->one($member['source_id']);
+                if ($source) {
+                    $string .= '<br/>来源:' . $source['name'];
+                }
             }
             
             return $string;
@@ -192,7 +210,7 @@ class Member
         if ($member['parent_mid'] && $member['parent_mid'] > 0) {
             $parent = Dever::db('agent/member')->one($member['parent_mid']);
             if ($parent) {
-                $result['邀请人信息'] = $this->getShowInfo($parent);
+                $result['上级信息'] = $this->getShowInfo($parent);
             }
         }
 
@@ -285,21 +303,21 @@ class Member
         $button[0]['btn'][] = array
         (
             'type' => 'link',
-            'link' => Dever::url('project/database/list?project=agent&table=order&search_option_mid='.$member['id'].'', 'manage'),
+            'link' => Dever::url('project/database/list?project=agent&table=order&search_option_mid='.$member['id'].'&[refer]', 'manage'),
             'name' => '代理订单',
         );
 
         $button[0]['btn'][] = array
         (
             'type' => 'link',
-            'link' => Dever::url('project/database/list?project=agent&table=order&search_option_parent_mid='.$member['id'].'', 'manage'),
+            'link' => Dever::url('project/database/list?project=agent&table=order&search_option_parent_mid='.$member['id'].'&[refer]', 'manage'),
             'name' => '直推代理订单',
         );
 
         $button[0]['btn'][] = array
         (
             'type' => 'link',
-            'link' => Dever::url('project/database/list?project=agent&table=member_level_log&search_option_mid='.$member['id'].'', 'manage'),
+            'link' => Dever::url('project/database/list?project=agent&table=member_level_log&search_option_mid='.$member['id'].'&[refer]', 'manage'),
             'name' => '升级日志',
         );
 
@@ -325,42 +343,42 @@ class Member
         $button[1]['btn'][] = array
         (
             'type' => 'link',
-            'link' => Dever::url('project/database/list?project=bill&table=cash&search_option_mid='.$member['id'].'', 'manage'),
+            'link' => Dever::url('project/database/list?project=bill&table=cash&search_option_mid='.$member['id'].'&[refer]', 'manage'),
             'name' => '资金账户',
         );
 
         $button[1]['btn'][] = array
         (
             'type' => 'link',
-            'link' => Dever::url('project/database/list?project=bill&table=sell&search_option_mid='.$member['id'].'', 'manage'),
+            'link' => Dever::url('project/database/list?project=bill&table=sell&search_option_mid='.$member['id'].'&[refer]', 'manage'),
             'name' => '业绩流水',
         );
 
         $button[1]['btn'][] = array
         (
             'type' => 'link',
-            'link' => Dever::url('project/database/list?project=agent&table=member_goods&search_option_mid='.$member['id'].'', 'manage'),
+            'link' => Dever::url('project/database/list?project=agent&table=member_goods&search_option_mid='.$member['id'].'&[refer]', 'manage'),
             'name' => '代理商权益',
         );
 
         $button[1]['btn'][] = array
         (
             'type' => 'link',
-            'link' => Dever::url('project/database/list?project=agent&table=dh_order&search_option_mid='.$member['id'].'', 'manage'),
+            'link' => Dever::url('project/database/list?project=agent&table=dh_order&search_option_mid='.$member['id'].'&[refer]', 'manage'),
             'name' => '权益订单',
         );
 
         $button[2]['btn'][] = array
         (
             'type' => 'link',
-            'link' => Dever::url('project/database/list?project=agent&table=member_agreement&search_option_mid='.$member['id'].'', 'manage'),
+            'link' => Dever::url('project/database/list?project=agent&table=member_agreement&search_option_mid='.$member['id'].'&[refer]', 'manage'),
             'name' => '代理商合同',
         );
 
         $button[2]['btn'][] = array
         (
             'type' => 'link',
-            'link' => Dever::url('project/database/list?project=agent&table=member&search_option_parent_mid='.$member['id'].'', 'manage'),
+            'link' => Dever::url('project/database/list?project=agent&table=member&search_option_parent_mid='.$member['id'].'&[refer]', 'manage'),
             'name' => '查看直推团队',
         );