edit

service/agent/lib/Import.php

@@ -48,6 +48,7 @@ class Import
 
     public function get_api()
     {
+        $this->date = Dever::maketime('2021-09-01 00:00:00');
         Dever::config('base')->hook = true;
         $host = 'https://cryl.yijiuguanfang.com/attachment/';
         
@@ -108,6 +109,7 @@ class Import
                 $data['parent_code'] = Dever::load("invite/api.code", $data['parent_mid']);
                 $data['address'] = $v['province'] . $v['city'] . $v['area'] . $v['street'];
                 $data['role'] = $this->getRole($v['agentlevel']);
+                $role = Dever::db('setting/role')->find($data['role']);
                 $data['area'] = '';
                 if ($v['datavalue']) {
                     $v['datavalue'] = trim(str_replace(" ", ',', $v['datavalue']));
@@ -122,8 +124,19 @@ class Import
                         list($data['area'], $new) = Dever::load('area/api')->upByName($v['province'], $v['city'], $v['area'], $v['street'], $v['streetvalue']);
                         # 记录日志
                         if ($data['area'] && strstr($data['area'], '-1')) {
-                            $this->log($v['id'], 5, $data['address'], $new, $update);
-                            $data['area'] = '';
+                            if ($role['id'] == 5) {
+                                # 创服代理商无需记录
+                                $data['area'] = '';
+                            } else {
+                                $date = $v['agentapplytime'];
+                                if ($role['id'] == 6 && $date <= $this->date) {
+                                    # 9月1日之前的创客无需导入
+                                    $data['area'] = '';
+                                } else {
+                                    $this->log($v['id'], 5, $data['address'], $new, $update);
+                                    $data['area'] = '';
+                                }
+                            }
                         }
                     }
                 }
@@ -138,10 +151,9 @@ class Import
                 $data['f_price'] = $data['price'];
 
                 if ($data['price'] < 1) {
-                    $this->log($v['id'], 6, $data['price'], $data['price'], $update);
+                    //$this->log($v['id'], 6, $data['price'], $data['price'], $update);
                 }
 
-                $role = Dever::db('setting/role')->find($data['role']);
                 if ($role['type'] == 1) {
                     //$data['f_price'] = $role['price'];
                 } elseif ($role['type'] == 2) {
@@ -257,7 +269,7 @@ class Import
                         $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'];
-                        //$data['group_sell'] = $v['allcommission'];
+                        $data['group_sell'] = $v['allcommission'];
                         $data['old_agentdownnum'] = $v['agentdownnum'];
                         $data['old_group_sell'] = $v['allcommission'];
 
@@ -273,7 +285,11 @@ class Import
                             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, '邀请' . $data['name'] . '['.$data['mobile'].']新增直推业绩', 3, $data['cdate']);
-                            Dever::load('bill/lib/sell')->up($data['parent_mid'], 2, $data['f_price'], $data['role'], $order_id, '邀请' . $data['name'] . '['.$data['mobile'].']新增团队业绩', 3, $data['cdate']);
+                            //Dever::load('bill/lib/sell')->up($data['parent_mid'], 2, $data['f_price'], $data['role'], $order_id, '邀请' . $data['name'] . '['.$data['mobile'].']新增团队业绩', 3, $data['cdate']);
+                        }
+
+                        if (!$update) {
+                            Dever::load('bill/lib/sell')->up($data['mid'], 2, $data['group_sell'], $data['role'], $order_id, '新增团队业绩', 3, time());
                         }
                     }
                     echo $v['id'];
@@ -335,7 +351,7 @@ class Import
             $state = Dever::load('invite/lib/relation')->add($info['uid'], $cur, $level, $order);
             if ($state) {
                 # 新增团队业绩
-                Dever::load('bill/lib/sell')->up($info['uid'], 2, $order['f_price'], $order['role'], $order['id'], '邀请' . $order['name'] . '['.$order['mobile'].']新增团队业绩', 3, $order['cdate']);
+                //Dever::load('bill/lib/sell')->up($info['uid'], 2, $order['f_price'], $order['role'], $order['id'], '邀请' . $order['name'] . '['.$order['mobile'].']新增团队业绩', 3, $order['cdate']);
             } else {
                 return $this->addRelation($cur, $parent, $level, $order);
             }
@@ -357,8 +373,8 @@ class Import
                 # 获取直推代理人数
                 $num = Dever::load('invite/api')->getChildNum($v['id'], 1);
                 if ($num != $v['old_agentdownnum']) {
-                    # 记录日志
-                    $this->log($v['id'], 2, $v['old_agentdownnum'], $num);
+                    # 记录日志 无需记录 数据无误
+                    //$this->log($v['id'], 2, $v['old_agentdownnum'], $num);
                 }
 
                 # 获取直推业绩
@@ -371,8 +387,8 @@ class Import
                 if ($sell && $sell['num']) {
                     $update['group_sell'] = $sell['num'];
                     if ($update['group_sell'] != $v['old_group_sell']) {
-                        # 记录日志
-                        $this->log($v['id'], 3, $v['old_group_sell'], $update['group_sell']);
+                        # 记录日志 无需记录
+                        //$this->log($v['id'], 3, $v['old_group_sell'], $update['group_sell']);
                     }
 
                     if ($v['level_id'] > 0) {

service/agent/lib/Manage.php

@@ -246,7 +246,7 @@ class Manage
                     }
                 }
             } elseif ($status == 3) {
-                $info = Dever::db('agent/order_process')->find($id);
+                $info = Dever::db('agent/order_process')->find(array('id' => $id, 'clear' => true));
                 if ($info && $info['status'] == 3) {
                     $info['type'] = explode(',', $info['type']);
                 }