edit

service/agent/database/member.php

@@ -472,6 +472,26 @@ return array
             'update'    => 'text',
         ),
 
+        'old_pwd'      => array
+        (
+            'type'      => 'varchar-32',
+            'name'      => 'pwd',
+            'default'   => '',
+            'desc'      => 'pwd',
+            'match'     => 'is_string',
+            'update'    => 'text',
+        ),
+
+        'old_salt'      => array
+        (
+            'type'      => 'varchar-32',
+            'name'      => 'salt',
+            'default'   => '',
+            'desc'      => 'salt',
+            'match'     => 'is_string',
+            'update'    => 'text',
+        ),
+
         'status'        => array
         (
             'type'      => 'tinyint-1',
@@ -543,6 +563,7 @@ return array
         'insert' => false,
         'delete' => false,
         'edit' => false,
+        'excel' => true,
         'button' => $button,
 
         'list_button' => $list_button,

service/agent/lib/Import.php

@@ -107,7 +107,11 @@ class Import
                 if (!$data['name']) {
                     $data['name'] = 'boss';
                 }
-                $data['password'] = $v['pwd'];
+                if ($v['pwd']) {
+                    $data['old_pwd'] = $v['pwd'];
+                    $data['old_salt'] = $v['salt'];
+                }
+                
                 if ($v['avatar'] && strstr($v['avatar'], 'http')) {
                     $data['avatar'] = $v['avatar'];
                 } elseif ($v['avatar']) {
@@ -288,7 +292,9 @@ 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'];
+                        if ($this->state == 1) {
+                            $data['group_sell'] = $v['allcommission'];
+                        }
                         $data['old_agentdownnum'] = $v['agentdownnum'];
                         $data['old_group_sell'] = $v['allcommission'];
 
@@ -488,6 +494,32 @@ class Import
         }
     }
 
+    # 同步pwd和salt
+    public function pwd_api()
+    {
+        $data = Dever::db('agent/member')->select();
+        if ($data) {
+            foreach ($data as $k => $v) {
+
+                $info = $this->db->fetch('select * from ims_ewei_shop_member where id =' . $v['id']);
+                if (!$info) {
+                    continue;
+                }
+                if (!$info['pwd']) {
+                    continue;
+                }
+                $update = array();
+                $update['old_pwd'] = $info['pwd'];
+                $update['old_salt'] = $info['salt'];
+
+                $update['where_id'] = $v['id'];
+                Dever::db('agent/member')->update($update);
+                echo $v['id'];
+                echo "\r\n";
+            }
+        }
+    }
+
     # 导入日志记录
     public function log($mid, $type, $before, $after, $update = false)
     {