rabin 2 anni fa
parent
commit
73de36e8b1

+ 11 - 0
service/agent/database/member_goods_log.php

@@ -194,6 +194,17 @@ return array
             'list_order' => 10,
         ),
 
+        'admin'     => array
+        (
+            'type'      => 'int-11',
+            'name'      => '操作人',
+            'default'   => '',
+            'match'     => 'is_numeric',
+            'desc'      => '操作人',
+            //'list'      => '"{admin}" > 0 ? Dever::load("manage/admin-find#username", {admin}) : "-"',
+            'list_order'  => 8,
+        ),
+
         'state'     => array
         (
             'type'      => 'tinyint-1',

+ 11 - 0
service/agent/database/order_process.php

@@ -205,6 +205,17 @@ return array
             'show'		=> 'type=3',
         ),
 
+        'admin'     => array
+        (
+            'type'      => 'int-11',
+            'name'      => '操作人',
+            'default'   => '',
+            'match'     => 'is_numeric',
+            'desc'      => '操作人',
+            //'list'      => '"{admin}" > 0 ? Dever::load("manage/admin-find#username", {admin}) : "-"',
+            'list_order'  => 8,
+        ),
+
         'state'     => array
         (
             'type'      => 'tinyint-1',

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

@@ -321,6 +321,11 @@ class Manage
         $order_id = Dever::param('order_id', $data);
         $order = Dever::db('agent/order')->find($order_id);
         if ($order_id && $order && $status) {
+            $admin = Dever::load('manage/auth.info');
+            if ($admin) {
+                Dever::db('agent/order_process')->update(array('where_id' => $id, 'admin' => $admin['id']));
+            }
+            
             if ($status < 3) {
                 if ($audit == 1) {
                     $update = array('where_id' => $order_id, 'status' => $status+1);

+ 4 - 0
service/agent/lib/Member_set.php

@@ -229,6 +229,10 @@ class Member_set
     	$data['desc'] = $desc;
         $data['name'] = $name;
     	$data['order_num'] = $this->getOrderId();
+        $admin = Dever::load('manage/auth.info');
+        if ($admin) {
+            $data['admin'] = $admin['id'];
+        }
 
     	$id = Dever::db('agent/member_goods_log')->insert($data);
 

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

@@ -1041,6 +1041,8 @@ class Order
                 if ($param['cash'] > 0) {
                     $data_param = Dever::array_encode($param);
                     $param['cash'] = '<a style="color:blue" class="set_cash" data-param="'.$data_param.'">' . $param['cash'] . '</a>';
+                } else {
+                    unset($param['goods']);
                 }
                 $table['body'][] = array('直推佣金', $parent_info['name'], $parent_info['mobile'], $parent_role['name'], $parent_level['name'], $param['per'] . '%', $param['cash']);
             }