Merge branch 'master' of http://git.dever.cc/dever-product/churen

service/agent/database/order.php

@@ -466,6 +466,16 @@ return array
             //'update'    => 'textarea',
         ),
 
+        'admin_desc'      => array
+        (
+            'type'      => 'varchar-800',
+            'name'      => '管理员备注',
+            'default'   => '',
+            'desc'      => '管理员备注',
+            'match'     => 'is_string',
+            //'update'    => 'textarea',
+        ),
+
         'status'        => array
         (
             'type'      => 'tinyint-1',

service/agent/database/order_process.php

@@ -148,11 +148,12 @@ return array
         'soft_price'      => array
         (
             'type'      => 'float-11,2',
-            'name'      => '软件服务费-如填写这里的软件服务费，将不使用角色设置的拆分规则',
+            'name'      => '软件服务费',
             'default'   => '0',
             'desc'      => '金额',
             'match'     => 'option',
             'update'    => 'text',
+            'value'     => Dever::input('soft_price', '0'),
             'show'      => 'cstatus=2',
         ),
 

service/agent/lib/Member.php

@@ -131,26 +131,25 @@ class Member
      */
     public function up($member, $order_id, $role, $type, $mid, $cash, $sell, $level_id = false, $desc = '', $group_num = 0)
     {
-        # 增加日志
-        Dever::load('bill/lib/cash')->up($mid, $type, $cash, $role, $order_id, $desc, 2);
+        $data['where_id'] = $mid;
+        if ($cash) {
+            Dever::load('bill/lib/cash')->up($mid, $type, $cash, $role, $order_id, $desc, 2);
+            $data['cash'] = $cash;
+        }
 
         Dever::load('bill/lib/sell')->up($mid, $type, $sell, $role, $order_id, $desc);
-
-        $data['where_id'] = $mid;
-        $data['cash'] = $cash;
+        
         $data['upcol'] = $sell;
         if ($level_id) {
             $data['level_id'] = $level_id;
         }
 
-        $method = 'upGroupSell';
-        /*
+        //$method = 'upGroupSell';
         if ($type == 1) {
             $method = 'upSell';
         } else {
             $method = 'upGroupSell';
         }
-        */
         $data['clear'] = true;
         Dever::db('agent/member')->$method($data);
 
@@ -178,9 +177,9 @@ class Member
             $result['邀请人信息'] = $this->getShowInfo($parent);
         }
 
-        $idcard_pic = '<a href="'.$member['idcard_front'].'" target="_blank"><img src="'.$member['idcard_front'].'" width="150" /></a>';
+        $idcard_pic = '<a href="'.$member['idcard_front'].'" target="_blank"><img src="'.$member['idcard_front'].'" width="100" /></a>';
         if ($member['idcard_back']) {
-            $idcard_pic .= '&nbsp;&nbsp;<a href="'.$member['idcard_back'].'" target="_blank"><img src="'.$member['idcard_back'].'" width="150" /></a>';
+            $idcard_pic .= '&nbsp;&nbsp;<a href="'.$member['idcard_back'].'" target="_blank"><img src="'.$member['idcard_back'].'" width="100" /></a>';
         }
         $member_name = $member['name'];
         $member_number = $member['idcard'];
@@ -200,7 +199,7 @@ class Member
         );
 
         if ($member['type'] == 2) {
-            $company_pic = '<a href="'.$member['company_pic'].'" target="_blank"><img src="'.$member['company_pic'].'" width="150" /></a>';
+            $company_pic = '<a href="'.$member['company_pic'].'" target="_blank"><img src="'.$member['company_pic'].'" width="100" /></a>';
             $member_name = $member['company_name'];
             $member_number = $member['company_number'];
 
@@ -421,7 +420,7 @@ class Member
                 array
                 (
                     array('资金余额', '<span style="color:blue">¥' . $member['cash'] . '元</span>'),
-                    //array('直推业绩', '<span style="color:blue">¥' . $member['sell'] . '元</span>'),
+                    array('直推业绩', '<span style="color:blue">¥' . $member['sell'] . '元</span>'),
                     array('团队业绩', '<span style="color:blue">¥' . $member['group_sell'] . '元</span>'),
                 ),
             ),

service/agent/lib/Order.php

@@ -421,12 +421,12 @@ class Order
             )
         );
 
-        $idcard_pic = '<a href="'.$info['idcard_front'].'" target="_blank"><img src="'.$info['idcard_front'].'" width="150" /></a>';
+        $idcard_pic = '<a href="'.$info['idcard_front'].'" target="_blank"><img src="'.$info['idcard_front'].'" width="100" /></a>';
         if ($info['idcard_back']) {
-            $idcard_pic .= '&nbsp;&nbsp;<a href="'.$info['idcard_back'].'" target="_blank"><img src="'.$info['idcard_back'].'" width="150" /></a>';
+            $idcard_pic .= '&nbsp;&nbsp;<a href="'.$info['idcard_back'].'" target="_blank"><img src="'.$info['idcard_back'].'" width="100" /></a>';
         }
         if ($info['sign']) {
-            $sign_pic = '<a href="'.$info['sign'].'" target="_blank"><img src="'.$info['sign'].'" width="150" /></a>';
+            $sign_pic = '<a href="'.$info['sign'].'" target="_blank"><img src="'.$info['sign'].'" width="100" /></a>';
         } else {
             $sign_pic = '暂无';
         }
@@ -434,7 +434,7 @@ class Order
 
         $pay_pic = '';
         if ($info['pay_pic']) {
-            $pay_pic = '&nbsp;&nbsp;<a href="'.$info['pay_pic'].'" target="_blank"><img src="'.$info['pay_pic'].'" width="150" /></a>';
+            $pay_pic = '&nbsp;&nbsp;<a href="'.$info['pay_pic'].'" target="_blank"><img src="'.$info['pay_pic'].'" width="100" /></a>';
         }
 
         $result['账号信息'] = array
@@ -464,7 +464,7 @@ class Order
         );
 
         if ($info['type'] == 2) {
-            $company_pic = '&nbsp;&nbsp;<a href="'.$info['company_pic'].'" target="_blank"><img src="'.$info['company_pic'].'" width="150" /></a>';
+            $company_pic = '&nbsp;&nbsp;<a href="'.$info['company_pic'].'" target="_blank"><img src="'.$info['company_pic'].'" width="100" /></a>';
             $result['账号信息']['content'][] = array
             (
                 array('企业名称', $info['company_name']),
@@ -545,12 +545,27 @@ class Order
     private function show_button($process, $info, $role)
     {
         $button = array();
-        $cstatus = ',cstatus';
+        $cstatus = ',cstatus,soft_price';
+        $soft_price = 0;
         if ($role['soft'] && $role['soft'] && $info['price'] > 0 && $info['status'] > 1) {
             //$cstatus = ',cstatus';
             //$soft = '【<a href="" style="color:blue">拆分代理费</a>】';
+            if (strstr($role['soft'], '%')) {
+                $role['soft'] = str_replace('%', '', $role['soft']);
+                $role['soft'] = $info['price'] * ($role['soft']/100);
+            }
+            $soft_price = $role['soft'];
         }
 
+        /*
+        $button[] = array
+        (
+            'type' => 'action',
+            'link' => Dever::url('lib/manage.setOrderStatus?id=' . $info['id'] . '&value=6', 'agent'),
+            'name' => '挂起',
+        );
+        */
+
         if ($info['status'] <= 3 && $info['status'] > 0) {
             # 未完成审核的订单，可以随时挂起
             $button[] = array
@@ -579,7 +594,7 @@ class Order
                     $cstatus = ',prize_type';
                 }
             }
-            $purl = Dever::url('project/database/update?project=agent&table=order_process&order_id='.$info['id'].'&status=1&col=order_id,status,audit,price,desc'.$cstatus.'&price='.$info['price'], 'manage');
+            $purl = Dever::url('project/database/update?project=agent&table=order_process&order_id='.$info['id'].'&status=1&col=order_id,status,audit,price,desc'.$cstatus.'&price='.$info['price'].'&soft_price=' . $soft_price, 'manage');
             if (isset($process[1]) && $process[1]) {
                 $purl .= '&where_id=' . $process[1]['id'];
             }
@@ -629,7 +644,9 @@ class Order
         $parents = array_merge($parents, Dever::load('invite/api')->getParentAll($parent_member['id'], 20));
 
         $parent_per = 0;
+        $max_per = 15;
         $level_up = false;
+        $html = '';
         foreach ($parents as $k => $v) {
             $parent_info = Dever::db('agent/member')->find($v['uid']);
             if ($parent_info && $parent_info['status'] == 2) {
@@ -687,17 +704,16 @@ class Order
                 if ($k == 0) {
                     $parent_name = $this->show_parent_reward($parent_info, $info, $role, $v, $parent_role, $parent_level, $child_num);
                 }
-                if ($parent_level['id']) {
-
-                    $param = array();
-                    $param['type'] = 2;
-                    $param['order_id'] = $info['id'];
-                    $param['parent_mid'] = $parent_info['id'];
-                    if (isset($level_up) && $level_up && isset($level) && $level) {
-                        $param['parent_level'] = $level['id'];
-                        $param['child_num'] = $child_num;
-                    }
-                    
+
+                $param = array();
+                $param['type'] = 2;
+                $param['order_id'] = $info['id'];
+                $param['parent_mid'] = $parent_info['id']; 
+                if (isset($level_up) && $level_up && isset($level) && $level) {
+                    $param['parent_level'] = $level['id'];
+                    $param['child_num'] = $child_num;
+                }
+                if ($parent_level['id'] && $parent_level['value'] > 0) {
                     $param['cash'] = $cash;
                     $param['per'] = $parent_level['value'];
 
@@ -706,6 +722,12 @@ class Order
                     $cash = '<a style="color:blue" class="set_cash" data-param="'.$data_param.'">' . $cash . '</a>';
 
                     $table['body'][] = array($parent_info['name'], $parent_role['name'], $parent_level['name'], $parent_level['value'] . '%', $cash);
+                } else {              
+                    $param['cash'] = 0;
+                    $param['per'] = 0;
+                    $data_param = Dever::array_encode($param);
+
+                    $html .= '<a style="color:blue;display:none;" class="set_cash" data-param="'.$data_param.'">&nbsp;&nbsp;</a>';
                 }
             }
         }
@@ -718,7 +740,7 @@ class Order
             $parent_title = '（已发放分润）';
             $parent_button = array();
         } else {
-            $parent_title = '（未发放分润）';
+            $parent_title = '（未发放分润）' . $html;
             /*
             $parent_button[] = array
             (

service/agent/src/Auth.php

@@ -29,7 +29,7 @@ class Auth
             Dever::alert('登录失败，密码错误，请重新输入');
         }
 
-        if ($user && $user['status'] == 2) {
+        if ($user && $user['status']) {
         	$data = Dever::load('passport/reg')->getSign($user['id']);
             return $data;
         } else {

service/agent/src/My.php

@@ -7,9 +7,11 @@ use Agent\Lib\Core;
 
 class My extends Core
 {
-    public function update()
+    public function test()
     {
-        Dever::commend();
+        # 1000 邀请 1001 1001 邀请 1002
+        //return Dever::load('invite/api')->getChild(1003); 
+        return Dever::load('invite/api')->setRelation(1006, 1005); 
     }
 
     /**

service/bill/database/sell.php

@@ -21,8 +21,8 @@ if ($mid) {
 }
 $type = array
 (
-    //1 => '直推',
-    2 => '自动发放',
+    1 => '直推业绩',
+    2 => '团队业绩',
     10 => '手动发放',
 );
 
@@ -118,9 +118,9 @@ return array
             'match'     => 'is_numeric',
             'search'    => 'select',
             'update'    => 'checkbox',
-            //'option'    => $type,
-            //'list'      => true,
-            //'list_order' => 7,
+            'option'    => $type,
+            'list'      => true,
+            'list_order' => 7,
         ),
 
         'type_id'      => array

service/bill/lib/Manage.php

@@ -91,7 +91,7 @@ class Manage
         if ($mid && $num && $desc) {
         	$member = Dever::db('agent/member')->find($mid);
         	if ($member && $member['status'] == 2) {
-        		Dever::load('bill/lib/sell')->up($mid, 2, $num, $member['role'], $id, $desc);
+        		Dever::load('bill/lib/sell')->up($mid, 10, $num, $member['role'], $id, $desc);
         		$where['where_id'] = $mid;
         		$where['group_sell'] = $num;
         		$where['sell'] = $num;

service/bill/lib/Sell.php

@@ -16,7 +16,7 @@ class Sell
             $desc = explode('，', $desc);
             $desc = $desc[0];
             $where['mid'] = $mid;
-            $where['type'] = 2;
+            $where['type'] = $type;
             $where['type_id'] = $type_id;
             $where['clear'] = true;
             $info = Dever::db('bill/sell')->find($where);

service/option/database/account.php

@@ -176,6 +176,7 @@ return array
             'desc'      => '身份证资料',
             'match'     => 'is_numeric',
             'option'    => $is_idcard,
+            'search'    => 'select',
             //'update'    => 'radio',
             'list'      => !$search_audit ? false : true,
             'list_order' => 3,

service/option/database/agreement.php

@@ -266,7 +266,7 @@ return array
             'desc'      => '合同状态',
             'match'     => 'is_numeric',
             'option'    => $status,
-            'search'    => 'select',
+            //'search'    => 'select',
             //'list'      => true,
             //'list_order' => 8,
         ),
@@ -274,12 +274,13 @@ return array
         'audit'        => array
         (
             'type'      => 'tinyint-1',
-            'name'      => '审核',
+            'name'      => '审核状态',
             'default'   => $col ? '3' : '1',
             'desc'      => '审核',
             'match'     => 'is_numeric',
             'option'    => $col ? $audit_manage : $audit,
             'update'    => 'radio',
+            'search'    => 'select',
             'control'   => 'audit',
             'value'     => $col ? '3' : '1',
             'list'      => true,

service/option/src/My.php

@@ -39,6 +39,27 @@ class My extends Core
             $this->data['agreement_state'] = 1;
         }
 
+        $agreement = Dever::db('option/agreement')->getOne(array('aid' => $this->uid));
+
+        $audit = array
+        (
+            'status' => 1,
+            'desc' => '',
+            'date' => date('Y.m.d H:i'),
+        );
+
+        if ($agreement) {
+            if ($agreement['audit'] == 3 && $total > 0) {
+                $audit['status'] = 1;
+                $audit['desc'] = '';
+            } else {
+                $audit['status'] = $agreement['audit'];
+                $audit['desc'] = $agreement['audit_desc'];
+            }
+        }
+
+        $this->data['audit'] = $audit;
+
         if ($this->data['cash']) {
             foreach ($this->data['cash'] as $k => $v) {
                 if ($v['type'] == 1) {