edit

service/agent/lib/Agreement.php

@@ -184,6 +184,7 @@ class Agreement
                 $state = Dever::db('agent/member_agreement')->update($up);
             } else {
                 $up = $where;
+
                 $up['content'] = Dever::array_encode($this->$method($v, $order));
                 $state = Dever::db('agent/member_agreement')->insert($up);
             }
@@ -413,7 +414,6 @@ class Agreement
         } else {
         	$idcard = $info['company_number'];
         }
-        $address = '';
 
         $role = Dever::db('setting/role')->find($info['role']);
         $name = $this->name($agreement, $info, $role);
@@ -423,7 +423,9 @@ class Agreement
 
         $price = $info['price'];
 
-        $area = Dever::load("area/api.string", $info['area'], '-');
+        $area = Dever::load("area/api.string", $info['area'], '');
+
+        $address = $area;
 
         if (isset($info['sdate']) && $info['sdate']) {
         	$sdate = date('Y年m月d日', $info['sdate']);
@@ -843,7 +845,8 @@ class Agreement
         } else {
         	$idcard = $info['company_number'];
         }
-        $address = '';
+        $area = Dever::load("area/api.string", $info['area'], '');
+        $address = $area;
 
         $role = Dever::db('setting/role')->find($info['role']);
         $name = $this->name($agreement, $info, $role);
@@ -852,7 +855,7 @@ class Agreement
         # 转大写
         $price_str = Dever::convertNum($price);
 
-        $area = '【' . Dever::load("area/api.string", $info['area'], '') . '】';
+        $area = '【' . $area . '】';
 
         if (isset($info['sdate']) && $info['sdate']) {
         	$sdate = date('Y年m月d日', $info['sdate']);

service/agent/lib/Core.php

@@ -8,6 +8,7 @@ class Core
 {
     protected $uid = -1;
     protected $use = array();
+    protected $check = true;
     public $data = array();
 
     public function __construct()
@@ -16,15 +17,19 @@ class Core
         if ($this->uid <= 0) {
             $this->uid = 4133;
         }
-        $this->checkLogin();
+        if ($this->check) {
+            $this->checkLogin();
+        }
+        
         if ($this->uid) {
             $this->user = Dever::db('agent/member')->find($this->uid);
         }
-
-        if ($this->user && $this->user['status'] <= 2) {
-            $this->user['uid'] = $this->user['id'];
-        } else {
-            Dever::alert('已被禁用', -3);
+        if ($this->check) {
+            if ($this->user && $this->user['status'] <= 2) {
+                $this->user['uid'] = $this->user['id'];
+            } else {
+                Dever::alert('已被禁用', -3);
+            }
         }
     }
 

service/agent/lib/Import.php

@@ -72,6 +72,7 @@ class Import
         # 获取已审核通过、权益已发放的用户
         $index = $index - 1;
         $limit = 1000;
+        
         $data = $this->db->fetchAll('select * from ims_ewei_shop_member where '.$this->get_yes_where().' order by id asc limit ' . $index . ', ' . $limit);
 
         if (!$data) {
@@ -83,6 +84,8 @@ class Import
             # 创建订单
             $order = Dever::db('agent/order')->find(array('id' => $v['id'], 'clear' => true));
             if (!$order) {
+                echo $v['id'];
+                echo "\r\n";
                 $data = array();
                 $data['id'] = $v['id'];
                 $data['mobile'] = $v['mobile'];
@@ -95,14 +98,12 @@ class Import
                 $data['parent_code'] = Dever::load("invite/api.code", $data['parent_mid']);
                 $data['role'] = $this->getRole($v['agentlevel']);
 
-                $data['area'] = str_replace(' ', ',', $v['datavalue']);
-                if ($v['streetvalue']) {
-                    $data['area'] .= ',' . $v['streetvalue'];
-                }
-                if ($data['area']) {
-                    Dever::load('area/api')->up($v['province'], $v['city'], $v['area'], $v['street'], $data['area']);
+                if ($v['datavalue']) {
+                    $data['area'] = Dever::load('area/api')->up($v['province'], $v['city'], $v['area'], $v['street'], $v['datavalue'], $v['streetvalue']);
+                } else {
+                    $data['area'] = Dever::load('area/api')->upByName($v['province'], $v['city'], $v['area'], $v['street'], $v['streetvalue']);
                 }
-
+                
                 if ($v['entertype'] == 1) {
                     $data['type'] = 1;
                 } else {
@@ -154,8 +155,8 @@ class Import
                 if ($v['receipt']) {
                     $receipt = Dever::json_decode($v['receipt']);
                     $data['pay_pic'] = array();
-                    foreach ($receipt as $k => $v) {
-                        $data['pay_pic'][] = $host . $v;
+                    foreach ($receipt as $v1) {
+                        $data['pay_pic'][] = $host . $v1;
                     }
                     $data['pay_pic'] = implode(',', $data['pay_pic']);
                 }
@@ -178,7 +179,12 @@ class Import
                 }
                 $data['order_type'] = 1;
                 $data['company_pic'] = '';
-                $order_id = Dever::db('agent/order')->insert($data);
+                $order = Dever::db('agent/order')->find(array('id' => $v['id'], 'clear' => true));
+                if (!$order) {
+                    $order_id = Dever::db('agent/order')->insert($data);
+                } else {
+                    $order_id = $order['id'];
+                }
 
                 if ($order_id) {
 
@@ -223,13 +229,17 @@ class Import
                         $data['where_id'] = $member['id'];
                         Dever::db('agent/member')->update($data);
                     }
+                    echo 1;
+                    echo "\r\n";
                 }
             }
         }
         $index = $index + 1;
-        return $index * $limit;
+        return $index + $limit;
     }
 
+    # 验证直推代理人数是否正确 agentdownnum
+
     # 导入区域价格
     private function getAreaPrice()
     {
@@ -420,7 +430,6 @@ class Import
     # 更新进度
     private function addProcess($order_id, $status, $time, $data)
     {
-        return;
         $where['order_id'] = $order_id;
         $where['status'] = $status;
         $info = Dever::db('agent/order_process')->find($where);

service/agent/src/Address.php

@@ -6,6 +6,7 @@ use Agent\Lib\Core;
 
 class Address extends Core
 {
+    protected $check = false;
     # 获取默认地址
     public function getDefaultAddress($mid)
     {