wugg 2 anni fa
parent
commit
0212bb0868
1 ha cambiato i file con 8 aggiunte e 5 eliminazioni
  1. 8 5
      app/admin/controller/Payment.php

+ 8 - 5
app/admin/controller/Payment.php

@@ -523,16 +523,19 @@ class Payment extends BaseController
            $payDel = ["is_del"=>1,"updatetime"=>date("Y-m-d H:i:s")];
            $pay =Db::name("pay")->where($data)->update($payDel);
            if($pay){
-               $infoup =Db::name("pay_info")->where(["cgdNo"=>$cgdNo,"is_del"=>0])->update($payDel);
+               $infoup =Db::name("pay_info")->where(["cgdNo"=>$cgdNo,"payNo"=>$payNo,"is_del"=>0])->update($payDel);
                if($infoup==false){
                    Db::rollback();
                    return error_show(1004,"对账删除失败");
                }
-               $cgdup =Db::name("cgd_info")->where(["sequenceNo"=>$cgdNo,"status"=>1])->update(['status'=>0,"updatetime"=>date("Y-m-d H:i:s")]);
-               if($cgdup==false){
-                    Db::rollback();
-                   return error_show(1004,"对账删除失败");
+               if(in_array($data['status'],[0,1,2])){
+               	 $cgdup =Db::name("cgd_info")->where(["sequenceNo"=>$cgdNo,"status"=>1])->update(['status'=>0,"updatetime"=>date("Y-m-d H:i:s")]);
+	               if($cgdup==false){
+	                    Db::rollback();
+	                   return error_show(1004,"对账删除失败");
+	               }
                }
+
                foreach ($cgdNo as $value){
                    $report=ReportCode::where(["cgdNo"=>$value])->find();
                    if($report)$report->rmField("payNo",$payNo);