loustwo vor 3 Jahren
Ursprung
Commit
4c8fa4ad4c

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

@@ -221,6 +221,7 @@ class OrderIssueController extends Controller
             $orderIssue = OrderIssue::query()->find($request->id);
             $orderIssue->update($data);
             SyncRejectedBillRejectingStatusJob::dispatch($orderIssue->order);
+            SyncOrderIssueOrWorkOrderBySWMS::dispatch($orderIssue,SyncOrderIssueOrWorkOrderBySWMS::$ORDER_ISSUE_TYPE);
             $this->logService->log(__METHOD__, __FUNCTION__, json_encode($request));
             return ['success' => true];
         } catch (Exception $e) {

+ 1 - 1
app/Http/Controllers/OrderIssueProcessLogController.php

@@ -3,6 +3,7 @@
 namespace App\Http\Controllers;
 
 use App\Exceptions\Exception;
+use App\Jobs\SyncOrderIssueOrWorkOrderBySWMS;
 use App\OrderIssue;
 use App\OrderIssueProcessLog;
 use App\Services\OrderIssueProcessLogService;
@@ -96,7 +97,6 @@ class OrderIssueProcessLogController extends Controller
             foreach ($logs as $log) {
                 $result_data[$log->order_issue_id] = $log;
             }
-            app('LogService')->log(__METHOD__, __FUNCTION__, json_encode($request->getContent()));
             return ['success' => true, 'logs' => $result_data];
         } catch (\Exception $e) {
             app('LogService')->log(__METHOD__, __FUNCTION__, json_encode($request->getContent()) . '||' . $e->getMessage() . "||" . $e->getTraceAsString());

+ 1 - 0
app/Http/Controllers/WorkOrderProcessLogController.php

@@ -2,6 +2,7 @@
 
 namespace App\Http\Controllers;
 
+use App\Jobs\SyncOrderIssueOrWorkOrderBySWMS;
 use App\Services\WorkOrderProcessLogService;
 use App\Services\WorkOrderService;
 use App\WorkOrder;

+ 7 - 1
app/Services/OrderIssueProcessLogService.php

@@ -2,6 +2,8 @@
 
 namespace App\Services;
 
+use App\Jobs\SyncOrderIssueOrWorkOrderBySWMS;
+use App\OrderIssue;
 use App\OrderIssueProcessLog;
 use Illuminate\Support\Facades\Auth;
 use App\Traits\ServiceAppAop;
@@ -21,11 +23,13 @@ class OrderIssueProcessLogService
         foreach ($ids as $id) {
             $logs[] = OrderIssueProcessLog::query()
                 ->create(['order_issue_id' => $id, 'content' => $content, 'user_id' => $user_id, 'type' => '处理']);
+            $orderIssue = OrderIssue::query()->where("id",$id)->first();
+            SyncOrderIssueOrWorkOrderBySWMS::dispatch($orderIssue,SyncOrderIssueOrWorkOrderBySWMS::$ORDER_ISSUE_TYPE);
         }
         return $logs;
     }
 
-    public function create(array  $params)
+    public function create(array $params)
     {
         $ids = $params['ids'];
         $content = $params['content'];
@@ -33,6 +37,8 @@ class OrderIssueProcessLogService
         $logs = [];
         foreach ($ids as $id) {
             $logs[] = OrderIssueProcessLog::query()->create(['order_issue_id' => $id, 'content' => $content, 'user_id' => $user_id, 'type' => $params['type']]);
+            $orderIssue = OrderIssue::query()->where("id",$id)->first();
+            SyncOrderIssueOrWorkOrderBySWMS::dispatch($orderIssue,SyncOrderIssueOrWorkOrderBySWMS::$ORDER_ISSUE_TYPE);
         }
         return OrderIssueProcessLog::query()->with('user')->whereIn('id',data_get($logs,'*.id'))->get();
     }

+ 3 - 2
app/Services/OrderIssueService.php

@@ -134,9 +134,7 @@ class OrderIssueService
             event(new AddOrUpdateOrderIssues(data_get($ordersIssues, '*.order_id')));
             $ordersIssues->each(function ($item){
                 SyncRejectedBillRejectingStatusJob::dispatch($item->order);
-                SyncOrderIssueOrWorkOrderBySWMS::dispatch($item,SyncOrderIssueOrWorkOrderBySWMS::$ORDER_ISSUE_TYPE);
             });
-//            $this->同步退单状态($ordersIssues);
             $param = [
                 'ids' => data_get($ordersIssues, '*.id'),
                 'content' => '',
@@ -144,6 +142,9 @@ class OrderIssueService
                 'type' => '创建'
             ];
             $this->orderIssueProcessLogService->create($param);
+            $ordersIssues->each(function ($item) {
+                SyncOrderIssueOrWorkOrderBySWMS::dispatch($item,SyncOrderIssueOrWorkOrderBySWMS::$ORDER_ISSUE_TYPE);
+            });
             $this->logService->log(__METHOD__, __FUNCTION__, '创建问题件' . count($innerParams) . json_encode($innerParams));
             return true;
         } catch (\Exception $e) {

+ 1 - 0
app/Services/WorkOrderCancelInterceptService.php

@@ -79,6 +79,7 @@ class WorkOrderCancelInterceptService extends WorkOrderService
             'type' => '创建',
         ]);
         $this->logService->createLog($detail, '创建', '创建工单');
+        $this->sendSWNSMessage($workOrder);
     }
 
     public function batchStore($params)

+ 1 - 0
app/Services/WorkOrderDamageService.php

@@ -86,6 +86,7 @@ class WorkOrderDamageService extends WorkOrderService
             'type' => '创建',
         ]);
         $this->logService->createLog($detail, '创建', '创建工单');
+        $this->sendSWNSMessage($workOrder);
     }
 
     /**

+ 1 - 0
app/Services/WorkOrderExpressAbnormalService.php

@@ -89,6 +89,7 @@ class WorkOrderExpressAbnormalService extends WorkOrderService
             'type' => '创建',
         ]);
         $this->logService->createLog($detail, '创建', '创建工单');
+        $this->sendSWNSMessage($work_order);
     }
 
     /**

+ 1 - 0
app/Services/WorkOrderInformationChangeService.php

@@ -89,6 +89,7 @@ class WorkOrderInformationChangeService extends WorkOrderService
         ]);
 
         $this->logService->createLog($detail, '创建', '创建工单');
+        $this->sendSWNSMessage($workOrder);
     }
 
     /**

+ 1 - 0
app/Services/WorkOrderInterceptService.php

@@ -103,6 +103,7 @@ class WorkOrderInterceptService extends WorkOrderService
             'type' => '创建',
         ]);
         $this->logService->createLog($detail, '创建', '创建');
+        $this->sendSWNSMessage($work_order);
     }
 
     /**

+ 1 - 0
app/Services/WorkOrderLogService.php

@@ -2,6 +2,7 @@
 
 namespace App\Services;
 
+use App\Jobs\SyncOrderIssueOrWorkOrderBySWMS;
 use App\Traits\ServiceAppAop;
 use App\WorkOrderDetail;
 use App\WorkOrderLog;

+ 1 - 0
app/Services/WorkOrderLossService.php

@@ -81,6 +81,7 @@ class WorkOrderLossService extends WorkOrderService
         ]);
 
         $this->logService->createLog($detail, '创建', '创建工单');
+        $this->sendSWNSMessage($work_order);
     }
 
     /**

+ 1 - 0
app/Services/WorkOrderMistakeService.php

@@ -79,6 +79,7 @@ class WorkOrderMistakeService extends WorkOrderService
             'type' => '创建',
         ]);
         $this->logService->createLog($detail, '创建', '商家创建');
+        $this->sendSWNSMessage($work_order);
     }
 
     /**

+ 3 - 2
app/Services/WorkOrderProcessLogService.php

@@ -2,6 +2,7 @@
 
 namespace App\Services;
 
+use App\Jobs\SyncOrderIssueOrWorkOrderBySWMS;
 use App\OrderIssue;
 use App\Traits\ServiceAppAop;
 use App\User;
@@ -35,7 +36,6 @@ class WorkOrderProcessLogService
 
         /** @var WorkOrder $work_order */
         $work_order = $detail->workOrder;
-
         if (in_array($work_order->status, ['宝时处理', '宝时终审'])
             && $work_order->bao_shi_tag != WorkOrder::$NO_STATE_TAG) {
 
@@ -50,7 +50,7 @@ class WorkOrderProcessLogService
             $detail->workOrder()->whereIn('status', [2, 6])->update(['owner_tag' => 1]);
         }
         $process_log->setAttribute('user', $user);
-
+        SyncOrderIssueOrWorkOrderBySWMS::dispatch($work_order,SyncOrderIssueOrWorkOrderBySWMS::$ORDER_ISSUE_TYPE);
         return $process_log;
     }
 
@@ -70,6 +70,7 @@ class WorkOrderProcessLogService
             $detail = $workOrder->details()->where('order_issue_type_id',$workOrder->order_issue_type_id)->orderByDesc('created_at')->first();
             if (!$detail) continue;
             $process_logs[] = $this->createProcessLog($detail, $params, $user);
+            SyncOrderIssueOrWorkOrderBySWMS::dispatch($workOrder,SyncOrderIssueOrWorkOrderBySWMS::$ORDER_ISSUE_TYPE);
         }
         return $process_logs;
     }

+ 7 - 0
app/Services/WorkOrderService.php

@@ -111,6 +111,7 @@ class WorkOrderService
             'work_order_status' => 0,
         ]);
         $this->logService->createLog($detail, '完结', '完结工单');
+        $this->sendSWNSMessage($workOrder);
     }
 
     /**
@@ -135,6 +136,8 @@ class WorkOrderService
         ]);
         $this->detailService->endDetail($detail);                       // 标记为处理过
         $this->logService->createLog($detail, '完结', '货主完结');
+        $this->sendSWNSMessage($detail->workOrder);
+
     }
 
     /**
@@ -445,6 +448,7 @@ class WorkOrderService
         $order_issue->logs()->insert($processLogs);
         $this->orderIssueService->endOrderIssues([$order_issue->id]);
         $detail->processLogs()->where('status', '未同步')->update(['status' => '同步']);
+        $this->sendSWNSMessage($work_order);
     }
 
     public function customRejectedStatus($ids, $customRejectedStatus): int
@@ -486,4 +490,7 @@ class WorkOrderService
         return ['success' => true];
     }
 
+    public function sendSWNSMessage($workOrder){
+        SyncOrderIssueOrWorkOrderBySWMS::dispatch($workOrder,SyncOrderIssueOrWorkOrderBySWMS::$ORDER_ISSUE_TYPE);
+    }
 }