Merge branch 'master-dev' of wugg/cxinv into master

app/admin/controller/Payment.php

@@ -1442,6 +1442,26 @@ class Payment extends BaseController
                        if($report)$report->rmField("hpNo",$hpNo);
                     }
                 }
+                if($payinv['status']==3){
+                    if($payinfo['inv_fee']< $payinv['inv_fee']){
+                        Db::rollback();
+                        return error_show(1005,"对账回票申请金额有误，请确认回票申请金额");
+                    }
+                     $payupdate =[
+                            "inv_fee"=>$payinfo['inv_fee']-$payinv['inv_fee'],
+                            "winv_fee"=>$payinfo['winv_fee']+$payinv['inv_fee'],
+                             "updatetime" => date("Y-m-d H:i:s")
+                        ];
+                        $pay =Db::name("pay")->where($payinfo)->update($payupdate);
+                        if($pay==false){
+                            Db::rollback();
+                            return error_show(1003,"删除失败");
+                     }
+                      foreach ($cgdNo as $value){
+                       $report=ReportCode::where(["cgdNo"=>$value])->find();
+                       if($report)$report->rmField("hpNo",$hpNo);
+                    }
+                }
                 Db::commit();
                 return app_show(0,"删除成功");
             }