Merge branch 'master' of ssh://47.103.131.176:10022/var/git/bswas

app/Http/Controllers/OrderIssueRejectedBillController.php

@@ -26,6 +26,8 @@ class OrderIssueRejectedBillController extends Controller
     {
         if (!Gate::allows('订单管理-问题件-编辑')) return ['success' => false, 'error' => '没有对应权限'];
         if (!$request->has('logistic_number_return')) return ['success' => false, 'error' => '参数为空'];
+        if(!$request['logistic_number_return'] || strlen($request['logistic_number_return']) === 0) return ['success' => false, 'error' => '参数异常'];
+
         /** @var OrderIssue $orderIssue */
         $orderIssue = OrderIssue::query()->find($request['id']);
         if (!$orderIssue) return ['success' => false, 'error' => '参数为空'];

app/Services/OrderRejectingStatusService.php

@@ -49,8 +49,8 @@ class OrderRejectingStatusService
             $query->update(['rejecting_status' => $rejecting_status, 'is_new_rejecting' => $is_new_rejecting]);
         }
 
-        if ($rejecting_status == '全部完成') {
-            $orderIssueTypeQuery = OrderIssueType::query()->where('name','拦截');
+        if ($rejecting_status == '全部退回') {
+            $orderIssueTypeQuery = OrderIssueType::query()->select('id')->where('name','拦截');
             $workOrder = WorkOrder::query()->where('order_id',$order->id)
                 ->whereIn('order_issue_type_id',$orderIssueTypeQuery)->where('status','!=',6)->first();
             if($workOrder){