Merge branch 'master-dev' of wugg/cxinv into master

app/admin/controller/Customer.php

@@ -239,9 +239,9 @@ class Customer extends BaseController
              return error_show(1004,"开票信息已存在");
         }
         $people = isset($this->post['invoice_people'])&&$this->post['invoice_people']!=''?trim($this->post['invoice_people']):"";
-        if($people==''){
-           return error_show(1004,"参数 invoice_people 不能为空");
-        }
+//        if($people==''){
+//           return error_show(1004,"参数 invoice_people 不能为空");
+//        }
         $invoice_addr = isset($this->post['invoice_addr'])&&$this->post['invoice_addr']!=''?trim($this->post['invoice_addr']):"";
         if($invoice_addr==''){
            return error_show(1004,"参数 invoice_addr 不能为空");

app/admin/controller/Payment.php

@@ -990,6 +990,7 @@ class Payment extends BaseController
         if($payinfo==false){
               return error_show(1004,"对账单数据未找到");
         }
+        if($payinfo['winv_fee']<=0)  return error_show(1004,"对账单数据未开票金额为0");
         if($payinfo['status']!=2){
             return error_show(1004,"对账单数据未完成审核");
         }