修改退回件同订单的联系

app/Http/Controllers/TestController.php

@@ -56,7 +56,7 @@ class TestController extends Controller
     {
         /** @var OrderRejectedBillRelationService $service */
         $service = app('OrderRejectedBillRelationService');
-        $service->orderSyncRejectedBill(Order::find(3));
+        $service->orderSyncRejectedBill(Order::query()->find(12));
     }
 
     public function testRejectedBill()

app/Services/OrderRejectedBillRelationService.php

@@ -64,7 +64,6 @@ class OrderRejectedBillRelationService
         $logistic_number_returns = array_unique(
             array_merge($this->getOrderPackagesLogisticNumbers($order), $this->getOracleOrderHeaderRelationLogisticNumbers($order))
         );
-
         $logistic_number_returns = $this->filtersCanBeJoinLogisticNumberReturns($order, $logistic_number_returns);
 
         $order_issue = OrderIssue::query()->where('order_id',$order->id)->first();
@@ -91,6 +90,22 @@ class OrderRejectedBillRelationService
         })->toArray();
     }
 
+    /**
+     * @param Order $order
+     * @param array $logistic_number_returns
+     * @return array
+     */
+    public function filtersCanBeJoinLogisticNumberReturns(Order $order, array $logistic_number_returns): array
+    {
+        $order_issue_rejected_bill_logistic_number_returns = $this->geExistRelationLogisticNumberReturn($order, $logistic_number_returns);
+
+        $logistic_number_returns = array_diff($logistic_number_returns, $order_issue_rejected_bill_logistic_number_returns);
+
+        $rejected_bill_logistic_number_return = $this->getExistRejectedBIllLogisticNumberReturn($logistic_number_returns);
+
+        return array_intersect($logistic_number_returns, $rejected_bill_logistic_number_return);
+    }
+
     /**
      * @param Order $order
      * @param array $logistic_numbers
@@ -119,20 +134,4 @@ class OrderRejectedBillRelationService
             })->toArray();
     }
 
-    /**
-     * @param Order $order
-     * @param array $logistic_number_returns
-     * @return array
-     */
-    public function filtersCanBeJoinLogisticNumberReturns(Order $order, array $logistic_number_returns): array
-    {
-        $order_issue_rejected_bill_logistic_number_returns = $this->geExistRelationLogisticNumberReturn($order, $logistic_number_returns);
-
-        $logistic_number_returns = array_diff($logistic_number_returns, $order_issue_rejected_bill_logistic_number_returns);
-
-        $rejected_bill_logistic_number_return = $this->getExistRejectedBIllLogisticNumberReturn($logistic_number_returns);
-
-        return array_intersect($logistic_number_returns, $rejected_bill_logistic_number_return);
-    }
-
 }

app/Services/OrderRejectingStatusService.php

@@ -27,17 +27,18 @@ class OrderRejectingStatusService
     {
         if (!$order) return;
         $rejecting_status = $this->getOrderRejectingStatus($order);
+
         $order_detail = OrderDetail::query()->where('order_id', $order->id)->first();
         if (!$order_detail) {
             OrderDetail::query()->create(
-                ['order_id' => $order->id, 'is_new_rejecting' => '有', 'rejecting_status' => $rejecting_status === '无' ? '无' : '有']
+                ['order_id' => $order->id, 'is_new_rejecting' =>$rejecting_status === '无' ? '无' : '有', 'rejecting_status' => $rejecting_status ]
             );
             return;
         }
         if (in_array($order_detail->is_new_rejecting, ['有', '已处理']) && $rejecting_status != '无') {
             $order_detail->update(['rejecting_status' => $rejecting_status]);
         } else {
-            $order_detail->update(['rejecting_status' => $rejecting_status, $rejecting_status => $rejecting_status === '无' ? '无' : '有']);
+            $order_detail->update(['rejecting_status' => $rejecting_status, 'is_new_rejecting' =>$rejecting_status === '无' ? '无' : '有']);
         }
     }
 

app/Services/OrderService.php

@@ -664,35 +664,6 @@ SQL;
         ];
     }
 
-//    /**
-//     * @param App/Order $order
-//     * @param App/OracleDOCOrderHeader $orderHeader
-//     */
-//    public function updateOrderByOrderHeader($order,$orderHeader)
-//    {
-//        if(!$orderHeader){return ;}
-//        if($orderHeader->orderno == $order->code){
-//            return ;
-//        }else if($orderHeader->soreference1 != $order->client_code){
-//            return ;
-//        }
-//        $params = $this->getParamByOrderHeader($orderHeader);
-//
-//        $data = [
-//                'code'=>$order->code ?? $params['code'],
-//                'owner_id'=>$order->code ?? $params['owner_id'],
-//                'shop_id'=>$order->code ?? $params['shop_id'],
-//                'logistic_id'=>$order->code ?? $params['logistic_id'],
-//                'consignee_name'=>$order->code ?? $params['consignee_name'],
-//                'province'=>$order->code ?? $params['province'],
-//                'city'=>$order->code ?? $params['city'],
-//                'district'=>$order->code ?? $params['district'],
-//                'address'=>$order->code ?? $params['address'],
-//                'wms_edittime'=>$order->code ?? $params['wms_edittime'],
-//                'wms_status'=>$order->code ?? $params['wms_status'],
-//        ];
-//        Order::query()->where('id',$order->id)->update($data);
-//    }
 
     public function getOrderByLogisticNumber($logisticNumber)
     {