edit

service/agent/database/member_account_log.php

@@ -149,8 +149,8 @@ return array
             'match'     => 'option',
             'search'    => 'linkage',
             'update'    => 'linkage',
-            'option'    => Dever::url('api.get?level_total=4', 'old_area'),
-            'list'      => 'Dever::load("area/api.string", "{old_area}")',
+            'option'    => Dever::url('api.get?level_total=4', 'area'),
+            'list'      => 'Dever::load("area/api.string", "{area}")',
         ),
         // 'audit_date'     => array
         // (

service/agent/database/member_area_log.php

@@ -149,8 +149,8 @@ return array
             'match'     => 'option',
             'search'    => 'linkage',
             'update'    => 'linkage',
-            'option'    => Dever::url('api.get?level_total=4', 'old_area'),
-            'list'      => 'Dever::load("area/api.string", "{old_area}")',
+            'option'    => Dever::url('api.get?level_total=4', 'area'),
+            'list'      => 'Dever::load("area/api.string", "{area}")',
         ),
 
         'type'        => array

service/agent/database/order.php

@@ -92,6 +92,13 @@ $level = function()
 	return $array;
 };
 
+$import = array
+(
+    1 => '最新系统',
+    2 => 'v2旧系统导入',
+    3 => 'v1旧系统导入',
+);
+
 $order_type = array
 (
     1 => '新购',
@@ -364,12 +371,12 @@ return array
 
 		'pay_pic'		=> array
 		(
-			'type' 		=> 'varchar-150',
+			'type' 		=> 'varchar-2000',
 			'name' 		=> '打款凭证',
 			'default' 	=> '',
 			'desc' 		=> '打款凭证',
 			'match' 	=> 'option',
-			'update'	=> 'image',
+			'update'	=> 'images',
 			'key' 		=> '1',
 			'place'		=> '150',
 		),
@@ -625,6 +632,17 @@ return array
             'update'    => 'text',
         ),
 
+        'import'        => array
+        (
+            'type'      => 'tinyint-1',
+            'name'      => '是否导入',
+            'default'   => '1',
+            'desc'      => '是否导入',
+            'match'     => 'is_numeric',
+            'option'    => $import,
+            'update'    => 'radio',
+        ),
+
         'state'     => array
         (
             'type'      => 'tinyint-1',

service/agent/lib/Import.php

@@ -48,6 +48,7 @@ class Import
 
     public function get_api()
     {
+        Dever::config('base')->hook = true;
         $host = 'https://cryl.yijiuguanfang.com/attachment/';
         
         $state = 1;
@@ -55,8 +56,14 @@ class Import
             $state = $this->get_data($host, $state);
         }
 
-        # 导入管理表
+        # 导入关联表
         //$this->getRelation();
+
+        # 导入地区价格
+        //$this->getAreaPrice();
+
+        # 导入余额 不导入了
+        //$this->getYue();
         return 'ok';
     }
 
@@ -84,6 +91,7 @@ class Import
                 $data['username'] = $v['nickname'];
                 $data['mid'] = $v['id'];
                 $data['parent_mid'] = $v['agentid'];
+                $data['admin_desc'] = $v['content'];
                 $data['parent_code'] = Dever::load("invite/api.code", $data['parent_mid']);
                 $data['role'] = $this->getRole($v['agentlevel']);
 
@@ -103,19 +111,24 @@ class Import
 
                 $role = Dever::db('setting/role')->find($data['role']);
                 if ($role['type'] == 1) {
-                    $data['f_price'] = $role['price'];
+                    //$data['f_price'] = $role['price'];
                 } elseif ($role['type'] == 2) {
+                    /*
                     $data['f_price'] = Dever::load('area/api')->getPrice($role['area'], $data['area']);
                     if ($data['f_price'] <= 0) {
                         $data['f_price'] = $data['price'];
                     }
+                    */
 
                     # 区域要进行占用
-                    Dever::load('area/api')->upStatus($data['area'], 2);
-                    $area_data = array('mid' => $v['id'], 'order_id' => $v['id'], 'role' => $data['role'], 'area' => $data['area']);
-                    $area_data['type'] = 4;
-                    $area_data['price'] = $data['f_price'];
-                    Dever::db('agent/member_area')->insert($area_data);
+                    if ($data['area']) {
+                        Dever::load('area/api')->upStatus($data['area'], 2);
+                        $area_data = array('mid' => $v['id'], 'order_id' => $v['id'], 'role' => $data['role'], 'area' => $data['area']);
+                        $area_data['type'] = 4;
+                        $area_data['price'] = $data['f_price'];
+                        $area_data['cdate'] = $v['agentapplytime'];
+                        Dever::db('agent/member_area')->insert($area_data);
+                    }
                 }
                 $data['agent_cash'] = $data['f_price'];
 
@@ -135,8 +148,14 @@ class Import
                 $data['address'] = $v['province'] . $v['city'] . $v['area'] . $v['street'];
 
                 $data['pay_type'] = 2;
-                $receipt = Dever::json_decode($v['receipt']);
-                $data['pay_pic'] = $host . $receipt[0];
+                if ($v['receipt']) {
+                    $receipt = Dever::json_decode($v['receipt']);
+                    $data['pay_pic'] = array();
+                    foreach ($receipt as $k => $v) {
+                        $data['pay_pic'][] = $host . $v;
+                    }
+                    $data['pay_pic'] = implode(',', $data['pay_pic']);
+                }
 
                 $data['status'] = $this->getStatus($v);
                 $data['audit_desc'] = $v['refuse'];
@@ -208,7 +227,171 @@ class Import
         return $index * $limit;
     }
 
-    # 导入管理表
+    # 导入区域价格
+    private function getAreaPrice()
+    {
+        $data = $this->db->fetchAll('select * from ims_ewei_shop_wang_city_other where deleted=0 and hide=0');
+        if ($data) {
+            foreach ($data as $k => $v) {
+                $province = Dever::db('area/province')->one(array('name' => $v['province']));
+                if ($province && $v['city']) {
+                    $city = Dever::db('area/city')->one(array('name' => $v['city'], 'province_id' => $province['id']));
+                    if ($city && $v['district']) {
+                        $county = Dever::db('area/county')->one(array('name' => $v['district'], 'city_id' => $city['id']));
+                        if ($county && $v['identity'] == 3) {
+                            # 区县
+                            Dever::db('area/county')->update(array('where_id' => $county['id'], 'price' => $v['money']));
+                        } elseif ($county && $v['street'] && $v['identity'] == 4) {
+                            # 街道
+                            if (strstr($v['street'], '燕郊')) {
+                                Dever::db('area/town')->update(array('where_id' => 131082450, 'price' => $v['money']));
+                                Dever::db('area/town')->update(array('where_id' => 131082109, 'price' => $v['money']));
+                            } else {
+                                $town = Dever::db('area/town')->one(array('name' => $v['street'], 'county_id' => $county['id']));
+                                if ($town) {
+                                    Dever::db('area/town')->update(array('where_id' => $town['id'], 'price' => $v['money']));
+                                }
+                            }
+                        }
+                    }
+                }
+            }
+        }
+    }
+
+    # 导入余额日志[不包括提现]
+    private function getYue()
+    {
+        $data = $this->db->fetchAll('select * from mc_credits_record where credittype = "credit2" order by id asc');
+        if ($data) {
+            foreach ($data as $k => $v) {
+                if ($v['credittype'] == 'credit2') {
+                    # 直推佣金
+                    $type = 1;
+                } elseif ($v['credittype'] == 'credit3') {
+                    # 市场培训费
+                    $type = 2;
+                } else {
+                    continue;
+                }
+                $remark = $v['remark'];
+                if (strstr($remark, '提现')) {
+                    continue;
+                }
+                $info = Dever::db('bill/cash')->one(array('id' => $v['id'], 'clear' => true));
+                if (!$info) {
+                    $update['id'] = $v['id'];
+                    $update['type'] = $type;
+
+                    if ($v['uid'] > 0) {
+                        $member = $this->db->fetch('select * from ims_ewei_shop_member where uid = ' . $v['uid'] . ' and isagent = 1 and status = 1 and prestatus = 1');
+                        if ($member) {
+                            $update['mid'] = $member['id'];
+                        }
+                    } elseif ($remark) {
+                        $temp = explode('OPENID: ', $remark);
+                        $temp = explode(' 剩余', $temp[1]);
+                        if (isset($temp[0]) && $temp[0]) {
+                            $member = $this->db->fetch('select * from ims_ewei_shop_member where openid = "' . $temp[0] . '" and isagent = 1 and status = 1 and prestatus = 1');
+                            if ($member) {
+                                $update['mid'] = $member['id'];
+                            }
+                        }
+                    }
+                    
+                    if (isset($update['mid']) && $update['mid'] > 0) {
+                        if (strstr($remark, '消费')) {
+                            $type = 12;
+                        }
+                        $update['cash'] = $v['num'];
+                        $update['yue'] = $v['presentcredit'];
+                        $update['status'] = 2;
+                        $update['audit'] = 2;
+                        $update['cdate'] = $update['operdate'] = $v['createtime'];
+                        $update['order_num'] = Dever::load('bill/lib/cash')->getOrderId();
+                        Dever::db('bill/cash')->insert($update);
+                    }
+                }
+            }
+        }
+    }
+
+    # 获取提现
+    private function getTixian()
+    {
+        $data = $this->db->fetchAll('select * from ims_ewei_shop_member_log where type > 0');
+        if ($data) {
+            foreach ($data as $k => $v) {
+                $v['id'] = 50000 + $v['id'];
+                $info = Dever::db('bill/cash')->one(array('id' => $v['id'], 'clear' => true));
+                if (!$info) {
+                    $update['id'] = $v['id'];
+                    $update['type'] = 11;
+
+                    if ($v['uid'] > 0) {
+                        $member = $this->db->fetch('select * from ims_ewei_shop_member where uid = ' . $v['uid'] . ' and isagent = 1 and status = 1 and prestatus = 1');
+                        if ($member) {
+                            $update['mid'] = $member['id'];
+                        }
+                    } elseif ($remark) {
+                        $member = $this->db->fetch('select * from ims_ewei_shop_member where openid = "' . $v['openid'] . '" and isagent = 1 and status = 1 and prestatus = 1');
+                        if ($member) {
+                            $update['mid'] = $member['id'];
+                        }
+                    }
+
+                    if (isset($update['mid']) && $update['mid'] > 0) {
+                        $update['cash'] = $v['num'];
+                        $update['yue'] = $v['presentcredit'];
+                        $status = 1;
+                        $fstatus = -1;
+                        if ($v['status'] == 0 && $v['check'] == 0) {
+                            # 待审核
+                            $status = 1;
+                        } elseif ($v['status'] != -1 && $v['check'] == 1) {
+                            # 已审核
+                            $status = 2;
+                        } elseif ($v['status'] == 0 && $v['check'] == 1) {
+                            # 待发放
+                            $status = 2;
+                            $fstatus = 1;
+                        } elseif ($v['status'] == 1 && $v['check'] == 1) {
+                            # 已发放
+                            $status = 2;
+                            $fstatus = 2;
+                        } elseif ($v['check'] == -1) {
+                            # 已拒绝
+                            $status = 3;
+                        }
+                        
+                        $update['status'] = $status;
+                        $update['audit'] = $status;
+                        $update['cdate'] = $v['createtime'];
+                        $update['operdate'] = $v['checktime'];
+                        $update['order_num'] = Dever::load('bill/lib/cash')->getOrderId();
+                        $id = Dever::db('bill/cash')->insert($update);
+                        if ($id) {
+                            $tixian['order_num'] = Dever::load('bill/lib/tixian')->getOrderId();
+                            $tixian['id'] = $v['id'];
+                            $tixian['cash_id'] = $v['id'];
+                            $tixian['mid'] = $update['mid'];
+                            $tixian['ycash'] = $v['money'];
+                            $tixian['cash'] = $v['realmoney'];
+                            $tixian['yue'] = $v['deductionmoney'];
+                            $tixian['name'] = $v['realname'];
+                            $tixian['bank'] = $this->upBank($v['bankname']);
+                            $tixian['bankname'] = $v['bankopen'];
+                            $tixian['card'] = $v['bankcard'];
+                            $tixian['status'] = $fstatus;
+                            Dever::db('bill/tixian')->insert($tixian);
+                        }
+                    }
+                }
+            }
+        }
+    }
+
+    # 导入关联表
     private function getRelation()
     {
         $data = $this->db->fetchAll('select * from ims_ewei_shop_commission_relation');
@@ -234,6 +417,7 @@ 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/lib/Order.php

@@ -550,13 +550,15 @@ class Order
                 $process[3]['type'] = explode(',', $process[3]['type']);
             }
 
-            # 分润信息
-            if ($parent_member) {
-                $this->show_parent($parent_member, $process, $info, $role, $result);
-            }
+            if ($info['import'] == 1) {
+                # 分润信息
+                if ($parent_member) {
+                    $this->show_parent($parent_member, $process, $info, $role, $result);
+                }
 
-            # 权益信息
-            $this->show_goods($process, $info, $role, $result);
+                # 权益信息
+                $this->show_goods($process, $info, $role, $result);
+            }
 
             # 合同信息
             $this->show_agreement($process, $info, $role, $sign_pic, $result);
@@ -1008,18 +1010,21 @@ class Order
         $table['body'] = array();
         $agreement_type = Dever::db('setting/agreement')->config['config_type'];
         $agreement_status = Dever::db('agent/member_agreement')->config['status'];
-        if (isset($process[3]['type']) && is_array($process[3]['type']) && in_array(5, $process[3]['type'])) {
+        if ((isset($process[3]['type']) && is_array($process[3]['type']) && in_array(5, $process[3]['type'])) || $info['import'] > 1) {
             $agreement_title = '（已生成合同）';
             $agreement_button = array();
 
             $agreement = Dever::db('agent/member_agreement')->getData(array('order_id' => $info['id']));
-            foreach ($agreement as $k => $v) {
-                $agreement_info = Dever::db('setting/agreement')->find($v['agreement_id']);
-                $agreement_status_name = $agreement_status[$v['status']];
+            if ($agreement) {
+                foreach ($agreement as $k => $v) {
+                    $agreement_info = Dever::db('setting/agreement')->find($v['agreement_id']);
+                    $agreement_status_name = $agreement_status[$v['status']];
 
-                $table['body'][] = array($agreement_type[$agreement_info['type']], Dever::load('agent/lib/agreement')->name($agreement_info, $v, $role, 2), $sign_pic, $agreement_status_name);
+                    $table['body'][] = array($agreement_type[$agreement_info['type']], Dever::load('agent/lib/agreement')->name($agreement_info, $v, $role, 2), $sign_pic, $agreement_status_name);
+                }
+            } else {
+                $agreement_title = '';
             }
-
         } else {
             $agreement_title = '（未生成合同）';
             

service/bill/database/cash.php

@@ -22,6 +22,7 @@ $type = array
     4 => '活动分佣',
     10 => '手动发放',
     11 => '提现',
+    12 => '消费',
 );
 
 $role = function()
@@ -50,6 +51,7 @@ return array
     'name' => 'cash',
     # 显示给用户看的名称
     'lang' => '资金流水',
+    'auto' => 100000,
     'set' => array
     (
     	'status' => $status,
@@ -127,9 +129,9 @@ return array
             'desc'      => '流水号',
             'match'     => 'is_string',
             'update'    => 'text',
-            //'search'    => 'fulltext',
-            //'list'      => true,
-            //'list_order'  => 1,
+            'search'    => 'fulltext',
+            'list'      => true,
+            'list_order'  => 1,
         ),
 
         'role'      => array

service/bill/database/tixian.php

@@ -27,6 +27,7 @@ return array
     'name' => 'tixian',
     # 显示给用户看的名称
     'lang' => '提现管理',
+    'auto' => 100000,
     'set' => array
     (
     	'status' => $status,
@@ -103,9 +104,9 @@ return array
             'desc'      => '流水号',
             'match'     => 'is_string',
             'update'    => 'text',
-            //'search'    => 'fulltext',
-            //'list'      => true,
-            //'list_order'  => 1,
+            'search'    => 'fulltext',
+            'list'      => true,
+            'list_order'  => 1,
         ),
 
         'ycash'      => array

service/bill/lib/Cash.php

@@ -48,6 +48,7 @@ class Cash
     public function getOrderId()
     {
         $where['order_num'] = Dever::order('C');
+        $where['clear'] = true;
         $state = Dever::db('bill/cash')->one($where);
         if (!$state) {
             return $where['order_num'];

service/bill/lib/Tixian.php

@@ -37,6 +37,7 @@ class Tixian
     public function getOrderId()
     {
         $where['order_num'] = Dever::order('C');
+        $where['clear'] = true;
         $state = Dever::db('bill/cash')->one($where);
         if (!$state) {
             return $where['order_num'];

service/option/database/agreement.php

@@ -379,7 +379,7 @@ return array
             'new' => array('查看', '"lib/agreement.location?id={id}"', 'option'),
             //'oper' => array('作废并生成', '"option/lib/manage.dropAgreement?id={id}"', "{status} == 2"),
             //'oper1' => array('更新', '"option/lib/manage.upAgreement?id={id}"', "{status} == 2"),
-            'edit' => array('审核', 'audit,audit_desc', '{audit} >= 2'),
+            'edit' => array('审核', 'audit,audit_desc', '{audit} == 2'),
         ),
     ),