ad

app/admin/command/GetOrderInfoAndInvoiceInfo.php

@@ -172,7 +172,23 @@ class GetOrderInfoAndInvoiceInfo extends Command
 				$invinfo =Db::name('invoice_red')->where(['invRed'=>$invNo,'is_del'=>0])->findOrEmpty();
 				$invNo = $invinfo['invNo']??'';
 				if(!key_exists('ZXBM' , $data[0])){
-					$data = $invinfo['DDMXXX']?json_decode($invinfo['DDMXXX'],true):[];
+					$data  =Db::name('invoice_good')
+            		->where(['invNo'=>$invNo,'is_del'=>0])
+            		->field("0 as FPHXZ,
+									catNo  as SPBM,
+									id as ZXBM,
+									is_discount as YHZCBS,
+									if(inv_tag=0,'',inv_tag) as  LSLBS,
+									addTax	as ZZSTSGL,
+									goodName as XMMC,
+									'' as DW,
+									'' as SPSL,
+									'' as DJ,
+									(-totalPrice) as JE,
+									0 HSBZ,
+									tax as SL,
+									-taxPrice as SE")->select()->toArray();
+//					$data = $invinfo['DDMXXX']?json_decode($invinfo['DDMXXX'],true):[];
 				}
 			}
 			foreach ($data as $value){
@@ -180,11 +196,11 @@ class GetOrderInfoAndInvoiceInfo extends Command
 					$invinfo =Db::name("invoice_good")->where(["invNo"=>$invNo,"id"=>$value['ZXBM'],'is_del'=>0])->findOrEmpty();
 					if(empty($invinfo)) continue;
 					if($status==4){
-					$invinfo['goodPrice'] = $value['DJ'];
-					$invinfo['totalPrice'] = $value['JE'];
-					$invinfo['taxPrice'] = $value['SE'];
+						$invinfo['goodPrice'] = $value['DJ'];
+						$invinfo['totalPrice'] = $value['JE'];
+						$invinfo['taxPrice'] = $value['SE'];
 					}else{
-					$invinfo['goodNum'] =0;
+						$invinfo['goodNum'] =0;
 					}
 					$invinfo['updatetime'] = date("Y-m-d H:i:s");
 					Db::name("invoice_good")->save($invinfo);

app/admin/controller/OrderInv.php

@@ -939,7 +939,9 @@ class OrderInv extends BaseController{
             if($up){
             	if($status==1){
             		if($return_type==1){
+            			//普票
 	                    if(in_array($ticket['inv_type'],['007','026'])) $result= $this->addRedOpen($ticket,$return_reason,$invinfo['company_type'],$returnCode,$red_desc);
+	                    //专票
 	                    if(in_array($ticket['inv_type'],['004','028'])) $result= $this->addApplyRed($ticket,$return_reason,$returnCode,$red_desc);
 						if(isset($result['code'])){
 							if(isset($result['data']) &&$result['invRed']!='' ){
@@ -1079,7 +1081,6 @@ class OrderInv extends BaseController{
 									-taxPrice as SE")->select()->toArray();
 					if(empty($goodinfo)){
 						throw new \Exception("开票商品信息未找到", 10006);
-
 					}
 		if(count($goodinfo)>8){
 		$len =array_unique(array_column($goodinfo,'SL'));