Merge branch 'master' of http://git.dever.cc/dever-product/churen

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',

service/agent/database/order_cash.php

@@ -100,6 +100,15 @@ return array
             'match'     => 'is_numeric',
         ),
 
+        'goods'      => array
+        (
+            'type'      => 'text-255',
+            'name'      => '奖励的权益',
+            'default'   => '',
+            'desc'      => '奖励的权益',
+            'match'     => 'is_string',
+        ),
+
         'state'     => array
         (
             'type'      => 'tinyint-1',

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',

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);
@@ -670,6 +675,9 @@ class Manage
                     if (isset($t['prize_id'])) {
                         $insert['prize_id'] = $t['prize_id'];
                     }
+                    if (isset($t['goods'])) {
+                        $insert['goods'] = Dever::array_encode($t['goods']);
+                    }
                     Dever::db('agent/order_cash')->insert($insert);
                 } else {
                     $update['where_id'] = $info['id'];
@@ -678,6 +686,9 @@ class Manage
                     if (isset($t['prize_id'])) {
                         $update['prize_id'] = $t['prize_id'];
                     }
+                    if (isset($t['goods'])) {
+                        $update['goods'] = Dever::array_encode($t['goods']);
+                    }
                     Dever::db('agent/order_cash')->update($update);
                 }
 

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);
 

service/agent/lib/Order.php

@@ -984,20 +984,7 @@ class Order
                                     $prize_goods = Dever::db('setting/prize_goods')->select(array('prize_id' => $parent_prize['id']));
                                     if ($prize_goods) {
                                         foreach ($prize_goods as $pk => $pv) {
-                                            if ($pv['type'] == 1) {
-                                                $goods_info = Dever::load('goods/lib/info')->getInfoBySku($pv['type_id'], $pv['sku_id']);
-                                                if (isset($goods_info['sku'])) {
-                                                    $sku = '-' . $goods_info['sku']['string'];
-                                                } else {
-                                                    $sku = '';
-                                                }
-                                                $prize_goods[$pk]['name'] = '<a style="color:blue">' . $goods_info['name'] . $sku . '</a>';
-                                            } elseif ($pv['type'] == 2) {
-                                                $card = Dever::db('card/info')->find($pv['type_id']);
-                                                $pv['price'] = round($info['price']*($pv['num']/100), 2);
-                                                $prize_goods[$pk]['name'] = '<a style="color:blue">' . $pv['price'] . '元' . $card['name'] . '</a>';
-                                                $prize_goods[$pk]['num'] = $pv['num'] . '%';
-                                            }
+                                            $param['goods'][] = $pv;
                                         }
                                     }
 
@@ -1054,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']);
             }
@@ -1065,13 +1054,37 @@ class Order
             if ($order_cash['prize_id'] && $order_cash['prize_id'] > 0) {
                 $prize = Dever::db('setting/prize')->find($order_cash['prize_id']);
             }
+
+            if ($order_cash['goods'] && $order_cash['goods']) {
+                $param['goods'] = Dever::array_decode($order_cash['goods']);
+            }
         }
 
         if (isset($prize) && $prize) {
             $table['body'][] = array('赠送名额', $parent_info['name'], $parent_info['mobile'], $parent_role['name'], $parent_level['name'], '1', $prize['name']);
         }
-        if (isset($prize_goods)) {
-            foreach ($prize_goods as $pv) {
+        if (isset($param['goods'])) {
+            foreach ($param['goods'] as $pv) {
+                if ($pv['type'] == 1) {
+                    $goods_info = Dever::load('goods/lib/info')->getInfoBySku($pv['type_id'], $pv['sku_id']);
+                    if (isset($goods_info['sku'])) {
+                        $sku = '-' . $goods_info['sku']['string'];
+                    } else {
+                        $sku = '';
+                    }
+                    $pv['name'] = '<a style="color:blue">' . $goods_info['name'] . $sku . '</a>';
+                } elseif ($pv['type'] == 2) {
+                    $card = Dever::db('card/info')->find($pv['type_id']);
+                    if ($card['create_type'] == 3) {
+                        $pv['price'] = round($info['price']*($pv['num']/100), 2);
+                        $pv['num'] = $pv['num'] . '%';
+                    } else {
+                        $pv['price'] = $card['price'] * $pv['num'];
+                    }
+                    
+                    $pv['name'] = '<a style="color:blue">' . $pv['price'] . '元' . $card['name'] . '</a>';
+                    
+                }
                 $table['body'][] = array('赠送权益', $parent_info['name'], $parent_info['mobile'], $parent_role['name'], $parent_level['name'], $pv['num'], $pv['name']);
             }
         }