edit

service/agent/lib/Manage.php

@@ -61,8 +61,8 @@ class Manage
                 if(!$member['area']){
                     $member['area']='';
                 }
-               
-                $this->area_log($id,-1,$area_data['type'],$member['area'],$area,$area_data['price'],$member['role']);
+                $admin = Dever::load('manage/auth.info');
+                $this->area_log($id,-1,$area_data['type'],$member['area'],$area,$area_data['price'],$member['role'],$admin['id']);
             }
         }
     }
@@ -289,7 +289,7 @@ class Manage
                     # 对区域进行占用
                     $role = Dever::db('setting/role')->one($order['role']);
                     if ($role && $role['type'] == 2) {
-                        $area_data = array('mid' => $order['mid'], 'order_id' => $order['id'], 'role' => $order['role'], 'area' => $order['area']);
+                        $area_data = array('mid' => $order['mid'], 'order_id' => $order['id'], 'new_role' => $order['role'], 'area' => $order['area']);
                         $area_datas = array('mid' => $order['mid']);
                         $area = Dever::db('agent/member_area')->find($area_datas);
                         // print_R($area);die;
@@ -299,27 +299,33 @@ class Manage
                             $old_area = $area['area'];
                         }
                         $area_data['price'] = $order['price'];
+                         $oldorder = Dever::db('agent/order')->state(array('mid' =>$order['mid']));
+                        if (count($oldorder)>=2){
+                            $oldorder = Dever::db('agent/order')->getFindOne(array('id' => $order['id'],'mid' => $order['mid'],'order_type' => 2,'state' => 1));
+                        }else{
+                            $oldorder = Dever::db('agent/order')->find(array('mid' => $order['mid'],'order_type' => 1));
+                        }
+                        $oldrole = Dever::db('setting/role')->find($oldorder['role']);
+                        $area_data['old_role'] = $oldorder['id'];
                         Dever::db('agent/member_area')->insert($area_data);
                         Dever::load('area/api')->upStatus($order['area'], 2);
-                        
-                        if(!$old_area){
-                            $old_area='';
-                        }
-                        $this->area_log($order['mid'],$order['id'],$order['type'],$old_area,$order['area'],$order['price'],$order['role']);  
+                       
+                        $this->area_log($order['mid'],$order['id'],$order['type'],$old_role,$order['role'],$order['price'],$order['area'],-1);  
                     }
                 }
             }
         }
     }
     #区域日志
-    public function area_log($mid,$order_id,$type,$old_area,$new_area,$price,$role){
+    public function area_log($mid,$order_id,$type,$old_role,$new_role,$price,$area,$audit_admin){
         $data['mid']=$mid;
         $data['order_id']=$order_id;
         $data['type']=$type;
-        $data['old_area']=$old_area;
-        $data['new_area']=$new_area;
+        $data['old_role']=$old_role;
+        $data['new_role']=$new_role;
         $data['price']=$price;
-        $data['role']=$role;
+        $data['area']=$area;
+        $data['aduit_admin'] = $audit_admin;
         $ids=Dever::db('agent/member_area_log')->insert($data);
         return $ids;
 

service/agent/lib/Soft_cash.php

@@ -54,9 +54,11 @@ Class Soft_cash
 	            	$update['set_status'] = 2;
 	            }elseif($soft['audit'] == 2 && $soft['status'] == 2){
 	            	$update['set_status'] = 3;
-	            }elseif($soft['audit'] ==3 && $soft['status'] == 3){
+	            }elseif($soft['audit'] ==3){
 	            	$update['set_status'] = 4;
-	            }
+	            }elseif($soft['audit'] == 2 && $soft['status'] == 4){
+                    $update['set_status'] = 3;
+                }
 	            if($soft['audit']== 2 && $update['set_status'] == 3){
 	                $order['role'] = $info['role'];
 	                $order['soft_cash'] = $cash;
@@ -233,7 +235,7 @@ Class Soft_cash
 	            (
 	                'type' => 'edit',
 	                'link' => $purl,
-	                'name' => '驳回',
+	                'name' => '待财务终审',
 	            );
 	        }
 	    }

service/bill/database/order_stat.php

@@ -93,6 +93,28 @@ $config = array
             'list'      => true,
         ),
 
+         'no_num'        => array
+        (
+            'type'      => 'int-11',
+            'name'      => '未确认订单数',
+            'default'   => '0',
+            'desc'      => '未确认订单数',
+            'match'     => 'is_numeric',
+            'search'    => 'order',
+            'list'      => true,
+        ),
+
+        'no_cash'        => array
+        (
+            'type'      => 'float-11,2',
+            'name'      => '未确认订单额度',
+            'default'   => '0',
+            'desc'      => '未确认订单额度',
+            'match'     => 'is_numeric',
+            'search'    => 'order',
+            'list'      => true,
+            // 'round({cash}, 2)',
+        ),
         'state'     => array
         (
             'type'      => 'tinyint-1',

service/bill/lib/Cron.php

@@ -187,6 +187,14 @@ class Cron
             }
             $where['status'] = 2;
             $data['daili_num'] = Dever::db('agent/member')->getNum($where);
+            $where['status'] = '-2,1,2,3,5,6';
+            $data['no_num'] = Dever::db('agent/order')->getNum($where);
+            $no_cash = Dever::db('agent/order')->getCash($where);
+            if ($no_cash) {
+                $data['no_cash'] = $no_cash['total'];
+            } else {
+                $data['no_cash'] = 0;
+            }
             if (!$info) {
                 Dever::db('bill/order_stat')->insert($data);
             } else {