wugg 2 years ago
parent
commit
2ab50f6536
2 changed files with 22 additions and 2 deletions
  1. 3 0
      app/admin/controller/OrderInv.php
  2. 19 2
      app/admin/controller/Payment.php

+ 3 - 0
app/admin/controller/OrderInv.php

@@ -69,6 +69,9 @@ class OrderInv extends BaseController{
         $good=[];
         $invNo=makeNo("INV");
         $invfee=array_sum(array_column($orderArr,'inv_fee'));
+        if($company['denomination']!=''&& $invfee>intval($company['denomination'])*10000){
+                return error_show(1004,"开票面额不能超过{$company['denomination']}万元");
+        }
         Db::startTrans();
         try{
                foreach ($orderArr as $value){

+ 19 - 2
app/admin/controller/Payment.php

@@ -24,6 +24,8 @@ class Payment extends BaseController
         "special_electronic"=>"增值税电子专用发票",
         "electronic"=>"增值税电子普通发票",
         "toll"=>"增值税电子普通发票(通行费)",
+        "fully_digitalized_special_electronic"=>"全电专用发票",
+        "fully_digitalized_normal_electronic"=>"全电普通发票",
         ];
 
     public $invName= [
@@ -32,7 +34,10 @@ class Payment extends BaseController
              '11'=>"roll",//"增值税普通发票(卷式)",
              '08'=>"special_electronic",// "增值税电子专用发票",
              '10'=>"electronic",//"增值税电子普通发票",
-             '14'=>"toll"//"增值税电子普通发票(通行费)"
+             '14'=>"toll",//"增值税电子普通发票(通行费)"
+             '21'=>"fully_digitalized_special_electronic",//"全电专用发票"
+             '22'=>"fully_digitalized_normal_electronic",//"全电专用发票"
+
         ];
 //
 //    发票状态,取值范围:
@@ -995,17 +1000,29 @@ class Payment extends BaseController
 		foreach ($invArr as $item){
 			if(!isset($item['invType'])||$item['invType']=='') return error_show(1004,"参数 invType 不能为空");
 			if($item['invType']==1){
+				if(!isset($item['invoiceType'])||$item['invoiceType']=='')  return error_show(1004,"参数 invoiceType 不能为空");
+				if(!in_array($item['invoiceType'],[21,22])){
+					if(!isset($item['invCode'])||$item['invCode']=='')  return error_show(1004,"参数 invCode 不能为空");
+				}
 				if(!isset($item['invNumber'])||$item['invNumber']=='')  return error_show(1004,"参数 invNumber 不能为空");
 				if(!isset($item['invoiceType'])||$item['invoiceType']=='')  return error_show(1004,"参数 invoiceType 不能为空");
-				if(!isset($item['invCode'])||$item['invCode']=='')  return error_show(1004,"参数 invCode 不能为空");
 				if(!isset($item['open_time'])||$item['open_time']=='')  return error_show(1004,"参数 open_time 不能为空");
 				if(!isset($item['subtotal_amount'])||$item['subtotal_amount']=='')  return error_show(1004,"参数 subtotal_amount 不能为空");
+				if(in_array($item['invoiceType'],['04','11',"10",'14'])){
+					if(!isset($item['checkNumber'])||$item['checkNumber']=='')  return error_show(1004,"参数 checkNumber 不能为空");
+				}
 			}
 			if($item['invType']==2){
+				if(in_array($item['invoiceType'],[21,22])){
+					return error_show(1004,"全电发票暂不支持图片识别");
+				}
 				if(!isset($item['inv_img'])||$item['inv_img']=='')  return error_show(1004,"参数 inv_img 不能为空");
 				if(!isset($item['invName'])||$item['invName']=='')  return error_show(1004,"参数 invName 不能为空");
 			}
 			if($item['invType']==3){
+				if(in_array($item['invoiceType'],[21,22])){
+					return error_show(1004,"全电发票暂不支持图片识别");
+				}
 				if(!isset($item['inv_img'])||$item['inv_img']=='')  return error_show(1004,"参数 inv_img 不能为空");
 				if(!isset($item['invName'])||$item['invName']=='')  return error_show(1004,"参数 invName 不能为空");
 			}