dever 3 vuotta sitten
vanhempi
commit
9ab22f286b

+ 23 - 11
service/agent/database/member_level_log.php

@@ -32,8 +32,8 @@ return array
     # 表名
     'name' => 'member_level_log',
     # 显示给用户看的名称
-    'lang' => '代理商升级日志',
-    'menu' => false,
+    'lang' => '等级变更记录',
+    'order' => 9,
     # 数据结构
     'struct' => array
     (
@@ -78,7 +78,7 @@ return array
             'match'     => 'is_numeric',
             'list'		=> 'Dever::db("agent/order-find#order_num", {order_id})',
             'list'      => true,
-            'list_order' => 11,
+            'list_order' => 6,
         ),
 
         'agent-member-name'=> array
@@ -114,14 +114,14 @@ return array
             'match'     => 'is_string',
             'update'    => 'text',
             'search'    => 'fulltext',
-            'list'      => true,
-            'list_order'  => 2,
+            //'list'      => true,
+            //'list_order'  => 2,
         ),
 
         'old_level'        => array
         (
             'type'      => 'int-11',
-            'name'      => '原级别',
+            'name'      => '变更前等级',
             'default'   => '-1',
             'desc'      => '原级别',
             'match'     => 'is_numeric',
@@ -135,7 +135,7 @@ return array
         'new_level'        => array
         (
             'type'      => 'int-11',
-            'name'      => '新级别',
+            'name'      => '变更后等级',
             'default'   => '-1',
             'desc'      => '新级别',
             'match'     => 'is_numeric',
@@ -154,14 +154,14 @@ return array
             'desc'      => '新增业绩',
             'match'     => 'is_numeric',
             'update'    => 'text',
-            'list'      => true,
-            'list_order' => 5,
+            //'list'      => true,
+            //'list_order' => 5,
         ),
 
         'sell'      => array
         (
             'type'      => 'float-11,2',
-            'name'      => '业绩',
+            'name'      => '升级时业绩',
             'default'   => '0',
             'desc'      => '总业绩',
             'match'     => 'is_numeric',
@@ -170,6 +170,18 @@ return array
             'list_order' => 5,
         ),
 
+        'group_num'      => array
+        (
+            'type'      => 'int-11',
+            'name'      => '代理商团队数',
+            'default'   => '0',
+            'desc'      => '代理商团队数',
+            'match'     => 'is_numeric',
+            'update'    => 'text',
+            'list'      => true,
+            'list_order' => 9,
+        ),
+
         'state'     => array
         (
             'type'      => 'tinyint-1',
@@ -189,7 +201,7 @@ return array
             'insert'    => true,
             'search'    => 'date',
             'list'      => 'date("Y-m-d H:i", {cdate})',
-            'list_order' => 15,
+            'list_order' => 2,
         ),
     ),
 

+ 2 - 1
service/agent/lib/Level_log.php

@@ -9,7 +9,7 @@ class Level_log
 {
 
     # 记录日志
-    public function up($mid, $order_id, $old_level, $new_level, $new_sell, $sell)
+    public function up($mid, $order_id, $old_level, $new_level, $new_sell, $sell, $group_num = 0)
     {
     	$data['mid'] = $mid;
     	$data['order_id'] = $order_id;
@@ -17,6 +17,7 @@ class Level_log
     	$data['new_level'] = $new_level;
     	$data['new_sell'] = $new_sell;
     	$data['sell'] = $sell;
+        $data['group_num'] = $group_num;
     	$data['order_num'] = $this->getOrderId();
 
     	$id = Dever::db('agent/member_level_log')->insert($data);

+ 5 - 1
service/agent/lib/Manage.php

@@ -437,9 +437,13 @@ class Manage
                 if (!isset($t['parent_level'])) {
                     $t['parent_level'] = false;
                 }
+                if (!isset($t['child_num'])) {
+                    $t['child_num'] = 0;
+                }
                 $member = Dever::db('agent/member')->find($where['mid']);
                 $desc = $member['name'] . '成为代理商,佣金'.$t['per'].'%';
-                Dever::load('agent/lib/member')->up($member, $order['id'], $order['role'], $where['type'], $where['parent_mid'], $t['cash'], $order['agent_cash'], $t['parent_level'], $desc);
+                
+                Dever::load('agent/lib/member')->up($member, $order['id'], $order['role'], $where['type'], $where['parent_mid'], $t['cash'], $order['agent_cash'], $t['parent_level'], $desc, $t['child_num']);
             }
         }
     }

+ 2 - 2
service/agent/lib/Member.php

@@ -130,7 +130,7 @@ class Member
      * 更新余额和业绩
      * @return mixed
      */
-    public function up($member, $order_id, $role, $type, $mid, $cash, $sell, $level_id = false, $desc = '')
+    public function up($member, $order_id, $role, $type, $mid, $cash, $sell, $level_id = false, $desc = '', $group_num = 0)
     {
         # 增加日志
         Dever::load('bill/lib/cash')->up($mid, $type, $cash, $role, $order_id, $desc, 2);
@@ -156,7 +156,7 @@ class Member
         Dever::db('agent/member')->$method($data);
 
         if ($level_id) {
-            Dever::load('agent/lib/level_log')->up($mid, $order_id, $member['level_id'], $level_id, $sell, $member['sell'] + $sell);
+            Dever::load('agent/lib/level_log')->up($mid, $order_id, $member['level_id'], $level_id, $sell, $member['sell'] + $sell, $group_num);
         }
     }
 

+ 1 - 0
service/agent/lib/Order.php

@@ -644,6 +644,7 @@ class Order
                     $param['parent_mid'] = $parent_info['id'];
                     if (isset($level) && $level) {
                         $param['parent_level'] = $level['id'];
+                        $param['child_num'] = $child_num;
                     }
                     
                     $param['cash'] = $cash;