RejectedBill 同步订单信息

app/Http/Controllers/RejectedBillController.php

@@ -96,6 +96,7 @@ class RejectedBillController extends Controller
         $rejectedBill=new RejectedBill($request->all());
         $rejectedBill['id_operator'] = Auth::user()['id'];
         $rejectedBill->save();
+        $rejectedBill->syncOrderIssue();
         app(RejectedBillService::class)->syncOrderIssue($rejectedBill);
         app('LogService')->log(__METHOD__,__FUNCTION__.'_'.$rejectedBill['id'],json_encode($request->toArray()),Auth::user()['id']);
         return ['success'=>'true','id'=>$rejectedBill['id']];

app/OrderIssue.php

@@ -339,7 +339,6 @@ class OrderIssue extends Model
                 if($rejectedBill){
                     if(OrderIssueRejectedBill::isExit($this->id,$logistic_number))continue;
                     $this->joinRejectedBill($logistic_number);
-                    $rejectedBill->syncOrderInfo();
                     $this->is_new_rejecting = '有';
                 }
             }

app/RejectedBill.php

@@ -158,51 +158,6 @@ class RejectedBill extends Model
         return $this['is_loaded'];
     }
 
-    public function 同步问题件退件状态()
-    {
-        $orderIssue = $this->orderIssue()->first();
-        if ($orderIssue ?? false) {
-//            $this->同步退单状态();
-            $orderIssue->update(['is_new_rejecting' => '有']);
-        } else {
-            OrderIssue::query()->where('logistic_number_return', $this->logistic_number_return)->update(['is_new_rejecting' => '有']);
-        }
-    }
-
-    public function 同步问题件()
-    {
-        $orderIssue = $this->orderIssue()->first();
-        if(!isset($orderIssue)){
-            if(isset($this->order_number)){
-                $orderNumber = $this->order_number;
-                $orderIssue = OrderIssue::query()->with('order')->whereHas('order',function($query)use($orderNumber){
-                    $query->where('client_code',$orderNumber);
-                })->first();
-            }
-            if(isset($this->logistic_number_return) && !isset($orderIssue)){
-                $logistic_number_return = $this->logistic_number_return;
-                $orderHeader = OracleDOCOrderHeader::query()->where('soreference1',function($query)use($logistic_number_return){
-                    $query->select('asnreference2')->from('DOC_ASN_HEADER')->where('asnreference3',$logistic_number_return)->first();
-                })->first();
-                $orderIssue = OrderIssue::query()->with('order')->whereHas('order',function($query)use($orderHeader){
-                    $query->where('code',$orderHeader->orderno);
-                })->first();
-            }
-        }
-        if(isset($orderIssue)){
-//            $orderIssue->同步退单状态();
-            $orderIssue->update(['is_new_rejecting' => '有']);
-        }
-    }
-
-    private function 同步退单状态()
-    {
-        /** @var OrderIssue $orderIssue */
-        $orderIssue =  $this->orderIssue()->first();
-        if($orderIssue ?? false)
-            $orderIssue->同步退单状态();
-    }
-
     public function delete()
     {
         /** @var OrderIssue $orderIssue */
@@ -215,28 +170,16 @@ class RejectedBill extends Model
         return parent::delete(); // TODO: Change the autogenerated stub
     }
 
-    public function syncOrderInfo()
-    {
-        if(!$this['id'])return;
-        $order = $this->orderIssue->order ?? null;
-        if(!$order)return;
-        if($order->client_code)$this['order_number'] ?: $this['order_number'] =$order->client_code;
-        if($order->consignee_name)$this['sender'] ?: $this['sender'] = $order->consignee_name;
-        if($order->consignee_phone)$this['mobile_sender'] ?: $this['mobile_sender'] =$order->consignee_phone;
-        $this->save();
-    }
-
     public function syncOrderIssue()
     {
         if(isset($this->orderIssue)){
             $this->orderIssue->syncRejectingStatus();
-            $this->syncOrderInfo();
             return;
         }
         /** @var OrderIssue $orderIssue */
         $orderIssue = null;
         // 原单退回
-        if($this->logistic_number === '原单退回' || $this->logistic_number_return){
+        if($this->logistic_number === '原单退回'){
             $orderIssue = OrderIssue::query()->where('order_id',function ($query){
                 $query->from('order_packages')->selectRaw('order_id')->where('logistic_number',$this->logistic_number_return);
             })->first();
@@ -254,6 +197,5 @@ class RejectedBill extends Model
         if(!OrderIssueRejectedBill::isExit($orderIssue->id,$this->logistic_number_return)) $orderIssue->update(['is_new_rejecting' => '有']);
         $orderIssue->joinRejectedBill($this->logistic_number_return);
         $orderIssue->syncRejectingStatus();
-        $this->syncOrderInfo();
-    }
+     }
 }

app/Services/OrderIssueRejectedBillService.php

@@ -98,7 +98,7 @@ Class OrderIssueRejectedBillService
             return $rejectedBill->logistic_number_return;
         }))->get();
         $orderIssue->joinRejectedBill($logistic_number_return);
-        $this->syncOrderIssueRejectingStatus($orderIssue);
+        $orderIssue->syncRejectingStatus();
     }
 
     /**
@@ -118,20 +118,6 @@ Class OrderIssueRejectedBillService
         $order_issues->syncRejectingStatus();
     }
 
-    /**
-     * 根据问题件信息
-     * @param RejectedBill|Controller $rejectedBills
-     */
-    public function updateByOrderIssue($rejectedBills)
-    {
-        if(!$rejectedBills)return;
-        if(is_array($rejectedBills)){
-            foreach ($rejectedBills as $rejectedBill) {
-                $rejectedBill->syncOrderInfo();
-            }
-            return;
-        }
-        $rejectedBills->syncOrderInfo();
-    }
+
 
 }

app/Services/RejectedBillService.php

@@ -2,8 +2,6 @@
 
 namespace App\Services;
 
-use App\OracleDOCOrderHeader;
-use App\OrderIssue;
 use App\RejectedBill;
 use App\Services\common\BatchUpdateService;
 use App\Services\common\DataHandlerService;