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

service/bill/database/tixian.php

@@ -6,6 +6,7 @@ $status = array
     1 => array('name' => '已审核待发放', 'style' => 'font-weight:bold;color:green'),
     //2 => array('name' => '已审核待发放', 'style' => 'font-weight:bold;color:green'),
     2 => array('name' => '已发放', 'style' => 'font-weight:bold;color:#CD3700'),
+    3 => array('name' => '已作废','style' => 'font-weight:bold;color:#CD3700'),
 );
 
 $cash_status = array

service/bill/lib/Manage.php

@@ -82,6 +82,9 @@ class Manage
                         $where['where_id'] = $info['mid'];
                         $where['cash'] = -1*$tixian['ycash'];
                         Dever::db('agent/member')->upCash($where);
+                        $update['where_id'] = $tixian['id'];
+                        $update['status'] = 3;
+                        Dever::db('bill/tixian')->update($update);
                     }
                 }
             }

service/bill/lib/Tixian.php

@@ -66,6 +66,8 @@ class Tixian
             $status = '已审核待发放';
         }elseif($info['status']==2){
             $status = '已发放';
+        }elseif($info['status']==3){
+            $status = '已作废';
         }
         $html['status'] = $name.'<br/>'.$status;
         return $html;