Browse Source

“â€a

wugg 2 years ago
parent
commit
c1e383c724
1 changed files with 7 additions and 6 deletions
  1. 7 6
      app/admin/controller/OrderInv.php

+ 7 - 6
app/admin/controller/OrderInv.php

@@ -237,8 +237,14 @@ class OrderInv extends BaseController{
         $open_date =isset($this->post['open_date'])&&$this->post['open_date']!=''?trim($this->post['open_date']):"";
         $subtotal_fee =isset($this->post['subtotal_fee'])&&$this->post['subtotal_fee']!=''?floatval($this->post['subtotal_fee']):"";
         $checkCode =isset($this->post['checkCode'])&&$this->post['checkCode']!=''?trim($this->post['checkCode']):"";
+	     $update=[
+	            "status"=> $status,
+	            "exam_remark"=>$remark,
+	            "updatetime" => date("Y-m-d H:i:s")
+	            ];
         if($status==1){
            if($open_type==='')return error_show(1004,"参数 open_type 不能为空");
+            $update['open_type']=$open_type;
            if($open_type!=1){
                if($invCode==='') return error_show(1004,"参数 invCode 不能为空");
                if($invNum==='') return error_show(1004,"参数 invNum 不能为空");
@@ -252,12 +258,7 @@ class OrderInv extends BaseController{
            	    $status=7;
            }
         }
-        $update=[
-            "status"=> $status==2 && ($invinfo['inv_type']==3 || $invinfo['inv_type']==4) ? 3 : $status,
-            "exam_remark"=>$remark,
-            "updatetime" => date("Y-m-d H:i:s")
-            ];
-        $status==1 ? $update['open_type']=$open_type :"";
+		$update['status']=$status;
         Db::startTrans();
         try{