edit

service/agent/database/order_process.php

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

service/agent/lib/Core.php

@@ -14,7 +14,7 @@ class Core
     {
         $this->uid = Dever::load('passport/user')->check(false);
         if ($this->uid <= 0) {
-            $this->uid = 1000004;
+            $this->uid = 1000000;
         }
         $this->checkLogin();
         if ($this->uid) {

service/agent/lib/Manage.php

@@ -94,7 +94,8 @@ class Manage
             if ($status < 3) {
                 if ($audit == 1) {
                     $update = array('where_id' => $order_id, 'status' => $status+1);
-                    if ($status == 2) {
+                    if ($status == 1) {
+                        $soft_price = Dever::param('soft_price', $data);
                         $price = Dever::param('price', $data);
                         $prize_type = Dever::param('prize_type', $data);
                         if ($prize_type == 2) {
@@ -123,15 +124,20 @@ class Manage
                         $cstatus = Dever::param('cstatus', $data);
                         if ($cstatus && $cstatus == 2 && $price > 0) {
                             # 拆分代理费
-                            $role = Dever::db('setting/role')->one($order['role']);
-                            if ($role && $role['soft']) {
-                                if (strstr($role['soft'], '%')) {
-                                    $role['soft'] = str_replace('%', '', $role['soft']);
-                                    $role['soft'] = $price * ($role['soft']/100);
+                            if ($soft_price > 0) {
+                                $update['agent_cash'] = $price - $soft_price;
+                                $update['soft_cash'] = $soft_price;
+                            } else {
+                                $role = Dever::db('setting/role')->one($order['role']);
+                                if ($role && $role['soft']) {
+                                    if (strstr($role['soft'], '%')) {
+                                        $role['soft'] = str_replace('%', '', $role['soft']);
+                                        $role['soft'] = $price * ($role['soft']/100);
+                                    }
+
+                                    $update['agent_cash'] = $price - $role['soft'];
+                                    $update['soft_cash'] = $role['soft'];
                                 }
-
-                                $update['agent_cash'] = $price - $role['soft'];
-                                $update['soft_cash'] = $role['soft'];
                             }
                         }
                         

service/agent/lib/Order.php

@@ -554,9 +554,9 @@ class Order
     private function show_button($process, $info, $role)
     {
         $button = array();
-        $cstatus = '';
+        $cstatus = ',cstatus';
         if ($role['soft'] && $role['soft'] && $info['price'] > 0 && $info['status'] > 1) {
-            $cstatus = ',cstatus';
+            //$cstatus = ',cstatus';
             //$soft = '【<a href="" style="color:blue">拆分代理费</a>】';
         }
 
@@ -579,7 +579,16 @@ class Order
         }
 
         if ($info['status'] == 1) {
-            $purl = Dever::url('project/database/update?project=agent&table=order_process&order_id='.$info['id'].'&status=1&col=order_id,status,audit,desc', 'manage');
+            # 根据价值获取名额
+            $prize = Dever::db('setting/prize')->find(array('type' => 1, 'price' => $info['price']));
+            if ($prize) {
+                $member_goods = Dever::db('agent/member_goods')->getOne(array('mid' => $info['mid'], 'type' => 3, 'type_id' => $prize['id']));
+                if ($member_goods && $member_goods['num'] > 0) {
+                    # 有名额
+                    $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');
             if (isset($process[1]) && $process[1]) {
                 $purl .= '&where_id=' . $process[1]['id'];
             }
@@ -590,16 +599,8 @@ class Order
                 'name' => '业务初审',
             );
         } elseif ($info['status'] == 2) {
-            # 根据价值获取名额
-            $prize = Dever::db('setting/prize')->find(array('type' => 1, 'price' => $info['price']));
-            if ($prize) {
-                $member_goods = Dever::db('agent/member_goods')->getOne(array('mid' => $info['mid'], 'type' => 3, 'type_id' => $prize['id']));
-                if ($member_goods && $member_goods['num'] > 0) {
-                    # 有名额
-                    $cstatus = ',prize_type';
-                }
-            }
-            $purl = Dever::url('project/database/update?project=agent&table=order_process&order_id='.$info['id'].'&status=2&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=2&col=order_id,status,audit,desc', 'manage');
             if (isset($process[2]) && $process[2]) {
                 $purl .= '&where_id=' . $process[2]['id'];
             }

service/agent/src/My.php

@@ -336,7 +336,7 @@ class My extends Core
                 $update['status'] = 1;
             }
             
-            Dever::db('agent/member')->update($update);
+            Dever::db('agent/order')->update($update);
 
             return 'ok';
         }