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

service/agent/database/member_area.php

@@ -10,7 +10,13 @@ $role = function()
     }
     return $array;
 };
-
+$excel = false;
+if (Dever::load('manage/auth')->checkFunc('menu_240.menu_271', 'area_excel1', '已售区域列表导出')) {
+    $excel = array
+    (
+        array('已售区域列表导出', '已售区域列表导出', 'agent/lib/manage.out_arealog'),
+    );
+}
 $type = array
 (
     1 => '购买',
@@ -155,6 +161,7 @@ return array
         'delete' => false,
         'edit' => false,
         'page_list' => 'member_area',
+        'excel' => $excel,
     ),
 
     'request' => array

service/agent/lib/Manage.php

@@ -1027,4 +1027,42 @@ class Manage
         $where = array();
         return Dever::search('agent/member', $where);
     }
+    public function out_arealog($data){
+        $header = array('区域名称', '区域价值', '售出时间');
+        $body = array();
+        foreach($data as $k1=> $v1){
+            $member = Dever::db('agent/member')->find($v1['mid']);
+            $role = Dever::db('setting/role')->find($member['role']);
+            if ($role['type'] == 1) {
+                $data[$k1]['price'] = $role['price'];
+            } 
+            if(isset($data[$k1]['price']) && $data[$k1]['price']<1){
+                unset($data[$k1]);
+            }
+        }
+        $res = array_values($data);
+        foreach($res as $k=>$v){
+            $res[$k]['areas'] = Dever::load("area/api.string", $v['area']);
+            $member = Dever::db('agent/member')->find($v['mid']);
+            $role = Dever::db('setting/role')->find($member['role']);
+            $res[$k]['cdate'] = date('Y-m-d H:i',$v['cdate']);
+            if ($role['type'] == 1) {
+                $res[$k]['price'] = $role['price'];
+            } elseif ($role['type'] == 2) {
+                $res[$k]['price'] = Dever::load('area/api')->getPrice($role['area'], $v['area']);
+            }
+            
+           $d = array
+           (
+                $res[$k]['areas'],
+                $res[$k]['price'],
+                $res[$k]['cdate']
+
+            );
+
+           $body[] = $d;
+        }
+        $file = Dever::input('excel_name');
+        return Dever::excelExport($body, $header, $file);
+    }
 }