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

service/agent/daemon/relation.php

@@ -0,0 +1,7 @@
+<?php
+
+define('DEVER_DAEMON', true);
+
+include(dirname(__FILE__) . DIRECTORY_SEPARATOR . '../index.php');
+
+Dever::load('agent/lib/import.relation');

service/agent/database/member.php

@@ -85,7 +85,7 @@ if ($search_api_parent_mid && $getInfo != 1) {
     Dever::setInput('search_api_parent_mid', 0);
     $parent = Dever::db('agent/member')->find(array('mobile' => $search_api_parent_mid));
     Dever::setInput('search_api_parent_mid', $search_api_parent_mid);
-    Dever::setInput('search_option_parent_mid', $parent['id']);
+    //Dever::setInput('search_option_parent_mid', $parent['id']);
     if ($parent) {
         $info = '上级' . Dever::load('agent/lib/member')->getInfoString($parent) . ', 以下为直推列表：';
     }
@@ -98,21 +98,6 @@ if ($search_api_parent_mid && $getInfo != 1) {
     );
 }
 
-$list_button = array();
-if ($pmid) {
-    $list_button = array
-    (
-        'list1' => array('查看详情', '"member_area&mid={id}&page_type=1&search_type=1"'),
-        // 'list2' => array('查看上下级', 'http://192.168.33.10/churen/service/agent/assets/pc/html/index.html?mid={id}'),
-    );
-} else {
-    $list_button = array
-    (
-        'list1' => array('查看详情', '"member_area&mid={id}&page_type=1"'),
-        // 'list2' => array('查看上下级', 'http://192.168.33.10/churen/service/agent/assets/pc/html/index.html?mid={id}'),
-    );
-}
-
 $list_button = array
 (
     'list' => array('查看详情', '"member_area&mid={id}&page_type=1&[refer]"'),

service/agent/database/order.php

@@ -666,6 +666,7 @@ return array
             'type'      => 'int-11',
             'name'      => '处理时间',
             'match'     => array('is_numeric', time()),
+            'default'   => '',
             'desc'      => '',
             # 只有insert时才生效
             'insert'    => true,

service/agent/lib/Import.php

@@ -73,7 +73,7 @@ class Import
         $index = $index - 1;
         $limit = 1000;
         
-        $data = $this->db->fetchAll('select * from ims_ewei_shop_member where isagent = 1 order by id asc limit ' . $index . ', ' . $limit);
+        $data = $this->db->fetchAll('select * from ims_ewei_shop_member where status = 1 and  prestatus = 1 and isagent = 1 order by createtime asc limit ' . $index . ', ' . $limit);
 
         if (!$data) {
             return false;
@@ -202,23 +202,23 @@ class Import
                         $this->addProcess($order_id, 3, $v['agenttime'], $data);
                     }
 
-                    # 生成合同
-                    if ($data['sign']) {
-                        $this->addAgreement($data);
-                    }
+                    if ($data['status'] == 4) {
+                        # 生成合同
+                        if ($data['sign']) {
+                            $this->addAgreement($data);
+                        }
 
-                    $member = Dever::db('agent/member')->find($v['id']);
+                        $member = Dever::db('agent/member')->find($v['id']);
 
-                    if ($data['status'] == 4) {
-                        $data['status'] = 2;
-                    } elseif ($data['status'] == 5) {
-                        $data['status'] = 1;
-                        $data['state'] = 2;
-                    } else {
-                        $data['status'] = 1;
-                    }
+                        if ($data['status'] == 4) {
+                            $data['status'] = 2;
+                        } elseif ($data['status'] == 5) {
+                            $data['status'] = 1;
+                            $data['state'] = 2;
+                        } else {
+                            $data['status'] = 1;
+                        }
 
-                    if ($data['status'] == 2) {
                         $mc_member = $this->db->fetch('select * from ims_mc_members where uid = ' . $v['uid']);
                         $data['rdate'] = $v['agenttime'];
                         $data['cash'] = ($mc_member && $mc_member['credit2']) ? $mc_member['credit2'] : $v['credit2'];
@@ -232,7 +232,8 @@ class Import
                         }
 
                         if ($data['parent_mid']) {
-                            Dever::load('invite/api')->setRelation($data['mid'], $data['parent_mid']);
+                            # 添加直推关系
+                            Dever::load('invite/lib/relation')->add($data['parent_mid'], $data['mid'], 1);
                             # 为上级增加增加业绩
                             Dever::load('bill/lib/sell')->up($data['parent_mid'], 1, $data['f_price'], $data['role'], $order_id, '直推业绩', 1, $data['cdate']);
                             Dever::load('bill/lib/sell')->up($data['parent_mid'], 2, $data['f_price'], $data['role'], $order_id, '团队业绩', 1, $data['cdate']);
@@ -248,6 +249,27 @@ class Import
         return $index + $limit;
     }
 
+    # 设置邀请关系 要跑完所有数据才能设置
+    public function relation()
+    {
+        $data = Dever::db('invite/relation')->all(array('level' => 1));
+        if ($data) {
+            foreach ($data as $k => $v) {
+                $this->addRelation($v['to_uid'], $v['uid'], 2);
+            }
+        }
+    }
+
+    private function addRelation($cur, $parent, $level = 2)
+    {
+        $info = Dever::db('invite/relation')->one(array('to_uid' => $parent));
+        if ($info) {
+            Dever::load('invite/lib/relation')->add($info['uid'], $cur, $level);
+            $level = $level + 1;
+            $this->addRelation($cur, $info['uid'], $level);
+        }
+    }
+
     # 验证直推代理人数是否正确 agentdownnum
 
     # 导入区域价格