wugg 6 months ago
parent
commit
68431286a1
2 changed files with 4 additions and 1 deletions
  1. 1 1
      app/admin/controller/InvoiceItem.php
  2. 3 0
      app/admin/model/InvoiceItem.php

+ 1 - 1
app/admin/controller/InvoiceItem.php

@@ -192,7 +192,7 @@ class InvoiceItem extends Base{
             'total_amount|总金额' => 'require|float|gt:0',
             'remark|备注' =>'max:255',
         ]);
-        $itemArr= \app\admin\model\InvoiceItem::whereIn('id',array_column($param['list'],"itemId"))->column("id,invoiceCode,balance_amount,cat_code,tax","id");
+        $itemArr= \app\admin\model\InvoiceItem::whereIn('id',array_column($param['list'],"itemId"))->column("id,invoiceCode,order_type,balance_amount,cat_code,tax","id");
         $orderInfo=[];
         $orderItem=[];
         foreach($param["list"] as $v){

+ 3 - 0
app/admin/model/InvoiceItem.php

@@ -30,6 +30,7 @@ class InvoiceItem extends \think\Model {
         Log::info("修改发票明细状态:".json_encode($change,JSON_UNESCAPED_UNICODE));
         Log::info("跟后数据:".json_encode($model->toArray(),JSON_UNESCAPED_UNICODE));
         if(in_array($change["status"],[0,1,2])){
+             Log::info('跟后数据:'.json_encode($model->toArray(),JSON_UNESCAPED_UNICODE));
              $num = self::where(['invoiceCode'=>$code,'order_type'=>$orderType,'status'=>0])->count();
                 if($orderType==1){
                       $info= InvoicePool::where(['invNo'=>$code,'is_del'=>0])->findOrEmpty();
@@ -45,8 +46,10 @@ class InvoiceItem extends \think\Model {
                 }
                 if($orderType==2){
                     $info= PayInvoice::where(['hpNo'=>$code,'is_del'=>0])->findOrEmpty();
+                     Log::info('跟后数据:'.json_encode( $info->toArray(),JSON_UNESCAPED_UNICODE));
                     if(!$info->isEmpty()){
                         $pay = Pay::where(['payNo'=>$info->payNo,'is_del'=>0])->findOrEmpty();
+                          Log::info('跟后数据:'.json_encode( $pay->toArray(),JSON_UNESCAPED_UNICODE));
                         if(!$pay->isEmpty() && $pay->status==2){
                                    if($num==0 && $info->status==11){
                                            $info->status=12;