edit

service/agent/database/order.php

@@ -32,11 +32,12 @@ $source_id = function()
 
 $status = array
 (
+    -1 => '待签名',
     1 => '待业务初审',
     2 => '待财务终审',
     3 => '待权益发放',
     4 => '已完成',
-    5 => '已作废',
+    5 => '审核失败',
     6 => '挂起',
 );
 
@@ -454,6 +455,16 @@ return array
             'update'    => 'text',
         ),
 
+        'audit_desc'      => array
+        (
+            'type'      => 'varchar-400',
+            'name'      => '审核备注-从order_process中同步过来',
+            'default'   => '',
+            'desc'      => '审核备注',
+            'match'     => 'is_string',
+            //'update'    => 'textarea',
+        ),
+
         'status'        => array
         (
             'type'      => 'tinyint-1',
@@ -604,6 +615,20 @@ return array
 
     'request' => array
     (
+        'getOld' => array
+        (
+            # 匹配的正则或函数 选填项
+            'option' => array
+            (
+                'mid' => 'yes',
+                'status' => array('yes', 'in'),
+                'state' => 1,
+            ),
+            'order' => array('id' => 'asc'),
+            'type' => 'one',
+            'col' => '*',
+        ),
+
         'getData' => array
         (
             # 匹配的正则或函数 选填项

service/agent/lib/Manage.php

@@ -89,12 +89,12 @@ class Manage
         $status = Dever::param('status', $data);
         $desc = Dever::param('desc', $data);
         $order_id = Dever::param('order_id', $data);
-        if ($order_id && $status) {
+        $order = Dever::db('agent/order')->find($order_id);
+        if ($order_id && $order && $status) {
             if ($status < 3) {
                 if ($audit == 1) {
                     $update = array('where_id' => $order_id, 'status' => $status+1);
                     if ($status == 2) {
-                        $order = Dever::db('agent/order')->find($order_id);
                         $price = Dever::param('price', $data);
                         $prize_type = Dever::param('prize_type', $data);
                         if ($prize_type == 2) {
@@ -145,20 +145,7 @@ class Manage
                             if ($member) {
                                 $order['mid'] = $update['mid'] = $member['id'];
                             } else {
-                                $data = $where;
-                                $data['name'] = $order['name'];
-                                $data['idcard'] = $order['idcard'];
-                                $data['idcard_front'] = $order['idcard_front'];
-                                $data['idcard_back'] = $order['idcard_back'];
-                                $data['company_name'] = $order['company_name'];
-                                $data['company_pic'] = $order['company_pic'];
-                                $data['company_number'] = $order['company_number'];
-                                $data['role'] = 1;
-                                $data['parent_mid'] = $order['parent_mid'];
-                                $data['source_id'] = $order['source_id'];
-                                $order['mid'] = $update['mid'] = Dever::db('agent/member')->insert($data);
-
-                                Dever::load('invite/api')->setRelation($update['mid'], $data['parent_mid']);
+                                $order['mid'] = $update['mid'] = Dever::load('agent/lib/member')->create($order);
                             }
                         }
 
@@ -168,10 +155,10 @@ class Manage
 
                     Dever::db('agent/order')->update($update);
                 } else {
-                    Dever::db('agent/order')->update(array('where_id' => $order_id, 'status' => 5));
+                    
+                    Dever::db('agent/order')->update(array('where_id' => $order_id, 'status' => 5, 'history_status' => $order['status'], 'audit_desc' => $desc));
 
                     if (Dever::project('sms')) {
-                        $order = Dever::db('agent/order')->find($order_id);
                         Dever::load('sms/api')->send('daili_reg_no', $order['mobile'], array('name' => $order['name'], 'content' => $desc));
                     }
                 }
@@ -249,19 +236,7 @@ class Manage
             if ($member) {
                 $update['mid'] = $member['id'];
             } else {
-                $data = $where;
-                $data['name'] = $order['name'];
-                $data['idcard'] = $order['idcard'];
-                $data['idcard_front'] = $order['idcard_front'];
-                $data['idcard_back'] = $order['idcard_back'];
-                $data['company_name'] = $order['company_name'];
-                $data['company_pic'] = $order['company_pic'];
-                $data['company_number'] = $order['company_number'];
-                $data['role'] = 1;
-                $data['parent_mid'] = $order['parent_mid'];
-                $data['source_id'] = $order['source_id'];
-                $update['mid'] = Dever::db('agent/member')->insert($data);
-                Dever::load('invite/api')->setRelation($update['mid'], $data['parent_mid']);
+                $update['mid'] = Dever::load('agent/lib/member')->create($order);
             }
             Dever::db('agent/order')->update($update);
             $order['mid'] = $update['mid'];

service/agent/lib/Member.php

@@ -439,4 +439,32 @@ class Member
 
         return 'reload';
     }
+
+    public function create($data)
+    {
+        $insert['mobile'] = $data['mobile'];
+        $info = Dever::db('agent/member')->find(array('mobile' => $data['mobile']));
+        if (!$info) {
+            $insert['role'] = 1;
+            $insert['level_id'] = -1;
+            $insert['name'] = $data['name'];
+            $insert['idcard'] = $data['idcard'];
+            $insert['idcard_front'] = $data['idcard_front'];
+            $insert['idcard_back'] = $data['idcard_back'];
+            $insert['company_name'] = $data['company_name'];
+            $insert['company_pic'] = $data['company_pic'];
+            $insert['company_number'] = $data['company_number'];
+            $insert['parent_mid'] = $data['parent_mid'];
+            $insert['source_id'] = $data['source_id'];
+            $insert['type'] = $data['type'];
+            $mid = Dever::db('agent/member')->insert($data);
+            if ($mid && $data['parent_mid'] && $data['parent_mid'] > 0) {
+                Dever::load('invite/api')->setRelation($mid, $data['parent_mid']);
+            }
+            
+            return $mid;
+        } else {
+            return $info['id'];
+        }
+    }
 }

service/agent/lib/Order.php

@@ -97,9 +97,11 @@ class Order
         $data += $this->getPrice($member);
 
         $data['sign'] = Dever::input('sign');
+
+        /*
         if (!$data['sign']) {
             Dever::alert('手写签名不能为空');
-        }
+        }*/
 
         $data['order_num'] = $this->getOrderId();
 
@@ -142,11 +144,21 @@ class Order
         }
 
         $data['role'] = $where['role'];
-
-        $data['id'] = Dever::db('agent/order')->insert($data);
+        $data['status'] = -1;
+        $data['mid'] = Dever::load('agent/lib/member')->create($data);
+        if ($data['mid']) {
+            $data['id'] = Dever::db('agent/order')->insert($data);
+        } else {
+            $data['id'] = false;
+        }
 
         if ($data['id']) {
-        	$result = array();
+            # 生成代理商
+            $result = Dever::load('passport/reg')->getSign($data['mid']);
+            $result['order_id'] = Dever::encode($data['id']);
+            $agreement = Dever::db('setting/agreement')->getData();
+            list($temp, $result['agreement_1']) = Dever::load('agent/lib/agreement')->name($agreement[1], $data, $data['role'], 1, 2);
+            list($temp, $result['agreement_4']) = Dever::load('agent/lib/agreement')->name($agreement[4], $data, $data['role'], 1, 2);
         	$result['msg'] = '您的申请已经提交完成，请耐心等待，我们将在工作日8小时内为您通过审核，非常感谢。';
         	if ($data['pay_type'] == 3) {
         		$result['bank_msg'] = '您需要使用银行卡：所有人（'.$data['name'].'），账号（'.$data['bank_card'].'），转账至如下账户（'.$data['price_str'].'）:';
@@ -165,6 +177,42 @@ class Order
         }
     }
 
+    # 签名确认
+    public function sign()
+    {
+        $mid = Dever::load('passport/user')->check(false);
+        if ($mid <= 0) {
+            Dever::alert('登录失败');
+        }
+        $order_id = Dever::input('order_id');
+        if (!$order_id) {
+            Dever::alert('登录失败');
+        }
+        $order_id = Dever::decode($order_id);
+        $where['mid'] = $mid;
+        $where['order_id'] = $order_id;
+        $info = Dever::db('agent/order')->find($where);
+        if (!$info) {
+            Dever::alert('登录失败');
+        }
+        if ($info['status'] != -1) {
+            Dever::alert('验证失败');
+        }
+        $update['sign'] = Dever::input('sign');
+        if (!$update['sign']) {
+            Dever::alert('请上传签名');
+        }
+        $update['status'] = 1;
+        $update['where_id'] = $info['id'];
+        $state = Dever::db('agent/order')->update($update);
+        if ($state) {
+            $result = Dever::load('passport/reg')->getSign($mid);
+            return $result;
+        } else {
+            Dever::alert('验证失败');
+        }
+    }
+
     /**
      * 发起在线支付
      *

service/agent/src/Auth.php

@@ -56,7 +56,7 @@ class Auth
             Dever::alert('登录失败，密码错误，请重新输入');
         }
 
-        if ($user && $user['status'] == 2) {
+        if ($user && $user['status'] <= 2) {
             $data = Dever::load('passport/reg')->getSign($user['id']);
             return $data;
         } else {
@@ -80,6 +80,16 @@ class Auth
         }
     }
 
+    /**
+     * 注册验证
+     *
+     * @return mixed
+     */
+    public function sign()
+    {
+        return Dever::load('agent/lib/order')->sign();
+    }
+
     /**
      * 获取手机验证码
      * @return mixed

service/agent/src/My.php

@@ -24,6 +24,17 @@ class My extends Core
 
         # 获取团队数量
         $this->data['num'] = Dever::load('invite/api')->getChildNum($this->uid, 1);
+
+        # 获取当前正在申请的订单
+        $order = Dever::db('agent/order')->getOld(array('mid' => $this->uid));
+        if ($order) {
+            $this->data['user']['order_id'] = $order['id'];
+            $this->data['user']['audit'] = $order['status'];
+            if ($order['status'] != 5) {
+                $order['audit_desc'] = '';
+            }
+            $this->data['user']['audit_desc'] = $order['audit_desc'];
+        }
         
         return $this->data;
     }
@@ -275,6 +286,64 @@ class My extends Core
         return $this->data;
     }
 
+    # 修改信息
+    public function upOrderInfo()
+    {
+        $where = array();
+        $where['mid'] = $this->uid;
+        $where['id'] = Dever::input('id');
+        $info = Dever::db('agent/order')->find($where);
+
+        if ($info['status'] == 5) {
+            $update = array();
+            $update['name'] = Dever::input('name');
+            if (!$update['name']) {
+                Dever::alert('姓名不能为空');
+            }
+            $update['idcard'] = Dever::input('idcard');
+            if (!$update['idcard']) {
+                Dever::alert('身份证号不能为空');
+            }
+            $update['idcard_front'] = Dever::input('idcard_front');
+            if (!$update['idcard_front']) {
+                Dever::alert('请上传身份证正面');
+            }
+
+            $update['idcard_back'] = Dever::input('idcard_back');
+            if (!$update['idcard_back']) {
+                Dever::alert('请上传身份证反面');
+            }
+
+            $update['sign'] = Dever::input('sign');
+            if (!$update['sign']) {
+                Dever::alert('请填写签名');
+            }
+
+            if ($info['pay_type'] == 2) {
+                $update['pay_pic'] = Dever::input('pay_pic');
+                if (!$update['pay_pic']) {
+                    Dever::alert('请上传汇款截图');
+                }
+            }
+
+            $update['where_id'] = $this->uid;
+            Dever::db('agent/member')->update($update);
+
+            $update['where_id'] = $info['id'];
+            if ($info['history_status']) {
+                $update['status'] = $info['history_status'];
+            } else {
+                $update['status'] = 1;
+            }
+            
+            Dever::db('agent/member')->update($update);
+
+            return 'ok';
+        }
+
+        Dever::alert('无申请信息');
+    }
+
     private function getOrderInfo($info)
     {
         $info['role'] = Dever::db('setting/role')->find($info['role']);