Преглед изворни кода

问题件创建时 对快递状态进行关联

ajun пре 5 година
родитељ
комит
e7e67bcfb5

+ 0 - 3
app/Events/AddOrUpdateOrderIssues.php

@@ -2,11 +2,8 @@
 
 namespace App\Events;
 
-use Illuminate\Broadcasting\Channel;
 use Illuminate\Broadcasting\InteractsWithSockets;
-use Illuminate\Broadcasting\PresenceChannel;
 use Illuminate\Broadcasting\PrivateChannel;
-use Illuminate\Contracts\Broadcasting\ShouldBroadcast;
 use Illuminate\Foundation\Events\Dispatchable;
 use Illuminate\Queue\SerializesModels;
 

+ 2 - 0
app/Http/Controllers/OrderIssueController.php

@@ -2,6 +2,7 @@
 
 namespace App\Http\Controllers;
 
+use App\Events\AddOrUpdateOrderIssues;
 use App\Filters\OrderIssueFilters;
 use App\Imports\OrderIssueImport;
 use App\Logistic;
@@ -75,6 +76,7 @@ class OrderIssueController extends Controller
         $orderIssueService = app('OrderIssueService');
         $orderIssueService->validatorCreate($request)->validate();
         $orderIssue = $orderIssueService->create($request->all());
+        event(new AddOrUpdateOrderIssues([$orderIssue['order_id']]));
         if($request->has('logistic_number_return') && !OrderIssueRejectedBill::isExit($orderIssue->id,$request['logistic_number_return'])){
             $orderIssue->joinRejectedBill($request['logistic_number_return']);
         }

+ 2 - 0
app/Imports/OrderIssueImport.php

@@ -2,6 +2,7 @@
 
 namespace App\Imports;
 
+use App\Events\AddOrUpdateOrderIssues;
 use App\OracleActAllocationDetails;
 use App\OracleDOCOrderHeader;
 use App\Order;
@@ -106,6 +107,7 @@ class OrderIssueImport implements ToCollection, WithHeadingRow, WithMultipleShee
 
                 /** @var OrderIssue $orderIssue */
                 $orderIssue = OrderIssue::query()->create($arr);
+                event(new AddOrUpdateOrderIssues([$order['id']]));
                 $orderIssue->syncRejectedBills();
                 $orderIssue->syncRejectingStatus();
 

+ 4 - 4
app/Services/OrderIssueService.php

@@ -2,20 +2,17 @@
 
 namespace App\Services;
 
+use App\Events\AddOrUpdateOrderIssues;
 use App\OracleActAllocationDetails;
 use App\OracleDOCASNHeader;
 use App\OracleDOCOrderHeader;
 use App\OrderIssue;
 use App\OrderIssueProcessLog;
-use App\OrderIssueRejectedBill;
 use App\OrderIssueType;
 use App\OrderPackage;
 use App\Order;
 use App\RejectedBill;
-use App\RejectedBillItem;
-use App\ValueStore;
 use Carbon\Carbon;
-use Illuminate\Database\Query\Builder;
 use Illuminate\Http\Request;
 use Illuminate\Support\Facades\Auth;
 use Illuminate\Support\Facades\Validator;
@@ -73,6 +70,7 @@ class OrderIssueService
         try {
             $this->insert($innerParams);
             $ordersIssues = OrderIssue::query()->whereIn('order_id', data_get($innerParams, '*.order_id'))->get();
+            event(new AddOrUpdateOrderIssues(data_get($ordersIssues,'*.order_id')));
             $this->同步退单状态($ordersIssues);
             $param = [
                 'ids' => data_get($ordersIssues, '*.id'),
@@ -135,6 +133,7 @@ class OrderIssueService
             $orderIssue->syncRejectedBills();
             $orderIssue->syncRejectingStatus();
             $orderIssue->order = $order;
+            event(new AddOrUpdateOrderIssues([$orderIssue['order_id']]));
             app('LogService')->log(__METHOD__, __FUNCTION__, '创建问题件' . json_encode($orderIssue));
         } catch (\Exception $e) {
             app('LogService')->log(__METHOD__, __FUNCTION__, '创建问题件error' . json_encode($arr) . $e->getMessage() . $e->getTraceAsString());
@@ -202,6 +201,7 @@ class OrderIssueService
         $orderIssue->update(['order_id' => $order['id']]);
         $orderIssue->syncRejectedBills();
         $orderIssue->syncRejectingStatus();
+        event(new AddOrUpdateOrderIssues([$orderIssue['order_id']]));
         return $orderIssue;
     }