ad

app/admin/model/Assoc.php

@@ -15,7 +15,7 @@ class Assoc extends Model
 
     public static function subOrder($invNo)
     {
-        $list = self::where(["invNo"=>$invNo,"status"=>1])->field("id,orderCode,cancel_fee")->select();
+        $list = self::where(["viceCode"=>$invNo,"status"=>1,"type"=>"1"])->field("id,orderCode,cancel_fee")->select();
         if(!$list->isEmpty()){
             $order= QrdInfo::whereIn("sequenceNo",$list->column("orderCode"))
             ->column("id,sequenceNo,winv_fee,inv_fee,ainv_fee,invtime,inv_status,status,pay_status","sequenceNo");
@@ -33,12 +33,12 @@ class Assoc extends Model
                 }
             }
            (new QrdInfo())->saveAll($order);
-            self::where(['invNo'=>$invNo,'status'=>1])->save(['status'=>2,'assoc_time'=>date("Y-m-d H:i:s")]);
+            self::where(["id"=>$list->column('id')])->save(['status'=>2,'assoc_time'=>date("Y-m-d H:i:s")]);
         }
     }
     public static function addOrder($invNo)
     {
-        $list = self::where(['invNo'=>$invNo,'status'=>2])->field('id,orderCode,cancel_fee')->select();
+        $list = self::where(["viceCode"=>$invNo,"status"=>2,"type"=>"1"])->field('id,orderCode,cancel_fee')->select();
         if(!$list->isEmpty()){
             $order= QrdInfo::whereIn('sequenceNo',$list->column('orderCode'))
             ->column('id,sequenceNo,winv_fee,inv_fee,ainv_fee,invtime,inv_status,status,pay_status','sequenceNo');
@@ -55,14 +55,14 @@ class Assoc extends Model
                 }
             }
            (new QrdInfo())->saveAll($order);
-            self::where(['invNo'=>$invNo,'status'=>2])->save(['status'=>3]);
+            self::where(['id'=>$list->column('id')])->save(['status'=>3]);
             InvoiceGood::where(['is_del' => 0,'invNo' => $invNo,'orderCode' => $list->column('orderCode')])->save(["goodNum"=>0,"updatetime"=>date("Y-m-d H:i:s")]);
         }
     }
     //开票流程已走完 取消发票 从已开票中直接扣除到未开票中
     public static function addOrderWinv($invNo)
     {
-        $list = self::where(['invNo'=>$invNo,'status'=>2])->field('id,orderCode,cancel_fee')->select();
+        $list = self::where(['viceCode'=>$invNo,'status'=>2,'type'=>'1'])->field('id,orderCode,cancel_fee')->select();
         if(!$list->isEmpty()){
             $order= QrdInfo::whereIn('sequenceNo',$list->column('orderCode'))
             ->column('id,sequenceNo,winv_fee,inv_fee,ainv_fee,invtime,inv_status,status,pay_status','sequenceNo');
@@ -79,7 +79,7 @@ class Assoc extends Model
                 }
             }
            (new QrdInfo())->saveAll($order);
-            self::where(['invNo'=>$invNo,'status'=>2])->save(['status'=>3,'assoc_time'=>date('Y-m-d H:i:s')]);
+            self::where(['id'=>$list->column('id')])->save(['status'=>3]);
             InvoiceGood::where(['is_del' => 0,'invNo' => $invNo,'orderCode' => $list->column('orderCode')])->save(['goodNum'=>0,'updatetime'=>date('Y-m-d H:i:s')]);
         }
     }