ad

app/admin/controller/InvoiceItem.php

@@ -201,9 +201,9 @@ class InvoiceItem extends Base{
             if(!isset($orderInfo[$itemArr[$v['itemId']]['invoiceCode'].$v["code"]])){
                   $orderInfo[$itemArr[$v['itemId']]['invoiceCode'].$v['code']]= \app\admin\model\InvoiceOrder::getOrderInfo( $itemArr[$v['itemId']]['invoiceCode'],$v['code'],$param['order_type']);
             }
-             if(empty($orderInfo[$itemArr[$v['itemId']]['invoiceCode'].$v['code']]))$this->error("发票{$itemArr[$v['itemId']]['invoiceCode']}关联订单{$v['code']}信息不存在");
+             if($orderInfo[$itemArr[$v['itemId']]['invoiceCode'].$v['code']]->isEmpty())$this->error("发票{$itemArr[$v['itemId']]['invoiceCode']}关联订单{$v['code']}信息不存在");
             if($orderInfo[$itemArr[$v['itemId']]['invoiceCode'].$v['code']]['balance_amount']<$v['total_amount'])$this->error("{$v["code"]}订单金额不足");
-            if($orderInfo[$itemArr[$v['itemId']]['invoiceCode'].$v['code']]['merge_code'])$this->error("{$v["code"]}订单税目信息不存在");
+            if($orderInfo[$itemArr[$v['itemId']]['invoiceCode'].$v['code']]['merge_code']=="")$this->error("{$v["code"]}订单税目信息不存在");
              if($itemArr[$v['itemId']]['balance_amount']<$v['total_amount']){
                 $balance = bcsub($v['total_amount'],$itemArr[$v['itemId']]['balance_amount'],2);
                 $itemArr[$v['itemId']]['balance_amount']='0';

app/admin/model/InvoiceOrder.php

@@ -61,7 +61,7 @@ class InvoiceOrder extends \think\Model{
                 ->field('b.sequenceNo,b.goodNo,b.goodName,a.goodNum,a.goodPrice,a.totalPrice,c.merge_code,c.cat_code,c.cat_name,c.short_name,c.tax,c.inv_good_name')
                 ->findOrEmpty();
           } else{
-           $payNo = PayInvoice::where(['hpNo'=>$code])->value("payNo");
+           $payNo = PayInvoice::where(['hpNo'=>$code])->value("payNo","");
            $info = PayInfo::alias('a')
                 ->join('cgd_info b','a.cgdNo=b.sequenceNo','left')
                 ->join('order_category c','b.sequenceNo=c.code and b.goodNo=c.spuCode and c.order_type=2','left')
@@ -70,7 +70,7 @@ class InvoiceOrder extends \think\Model{
                 c.merge_code,c.cat_code,c.cat_name,c.short_name,c.tax,c.inv_good_name')
                 ->findOrEmpty();
         }
-       $info->isEmpty()??$info['balance_amount']= bcsub($info['totalPrice'],InvoiceOrder::getInvoiceOrderTotalFee($info['sequenceNo']),2); $info['balance_amount']= bcsub($info['totalPrice'],InvoiceOrder::getInvoiceOrderTotalFee($info['sequenceNo']),2);
+       $info->isEmpty()??($info['balance_amount']= bcsub($info['totalPrice'],InvoiceOrder::getInvoiceOrderTotalFee($info['sequenceNo']),2));
        return $info;
     }
 }