返回异常提示后，将发送消息代码往后移动

app/Service/OaService.php

@@ -624,7 +624,13 @@ class OaService extends Service
                     if (empty($employee_ids)) {
                         $oaOrder->state = 2;
                         $oaOrder->save();
-                        //审核通过
+
+                        list($parent_status,$parent_msg) = $this->returnOa($oaOrder->order_no, 1, $oaOrder->opt_case);
+                        if(!$parent_status){
+                            DB::rollBack();
+                            return [false,$parent_msg];
+                        }
+                        //审核通过 发送消息
                         $tmp_data = [
                             $order_detail['order_number'],
                             SysMenu::where('id',$oaOrder->menu_id)->value('title'),
@@ -635,11 +641,6 @@ class OaService extends Service
 
                         ];
                         $this->sendWxMsg($order_detail['crt_id'],2,0,$oaOrder->menu_id,$tmp_data);
-                        list($parent_status,$parent_msg) = $this->returnOa($oaOrder->order_no, 1, $oaOrder->opt_case);
-                        if(!$parent_status){
-                            DB::rollBack();
-                            return [false,$parent_msg];
-                        }
                     } else {
                         $oaOrder->state = 1;
                         $oaOrder->save();
@@ -685,12 +686,13 @@ class OaService extends Service
                     if ($detail['sort'] == 1||true) {
                         $oaOrder->state = 3;
                         $oaOrder->save();
-                        $this->sendWxMsg($order_detail['crt_id'],3,2,$oaOrder->menu_id,$tmp_data);
                         list($parent_status,$parent_msg) = $this->returnOa($oaOrder->order_no, 2, $oaOrder->opt_case);
                         if(!$parent_status){
                             DB::rollBack();
                             return [false,$parent_msg];
                         }
+                        //发送消息
+                        $this->sendWxMsg($order_detail['crt_id'],3,2,$oaOrder->menu_id,$tmp_data);
                     }else{
                         $id = OaOrderSub::where('sort', ($detail['sort'] - 1))->where('oa_order_id', $oaOrder->id)->value('id');
                         $employee_ids = OaOrderSubEmployee::where('oa_order_sub_id',$id)->pluck('employee_id')->toArray();
@@ -857,11 +859,9 @@ class OaService extends Service
 //        $oaOrder->state = 1;
 //        $oaOrder->save();
         list($parent_status,$parent_msg) = $this->returnOa($order_no, 3, $op_case);
-        if(!$parent_status){
-            return [false,$parent_msg];
-        }
-        return [true, '弃审成功'];
+        if(!$parent_status) return [false,$parent_msg];
 
+        return [true, ''];
     }