diff --git a/crmeb/app/services/order/StoreOrderDeliveryServices.php b/crmeb/app/services/order/StoreOrderDeliveryServices.php index 741ef3fa3..b8c668bcb 100644 --- a/crmeb/app/services/order/StoreOrderDeliveryServices.php +++ b/crmeb/app/services/order/StoreOrderDeliveryServices.php @@ -439,13 +439,9 @@ class StoreOrderDeliveryServices extends BaseServices switch ($type) { case 1://快递发货 $this->orderDeliverGoods($id, $data, $orderInfo, $storeName); - //用户推送消息事件 - event('notice.notice', [['orderInfo' => $orderInfo, 'storeName' => $storeName, 'data' => $data], 'order_postage_success']); break; case 2://配送 $this->orderDelivery($id, $data, $orderInfo, $storeName); - //用户推送消息事件 - event('notice.notice', [['orderInfo' => $orderInfo, 'storeName' => $storeName, 'data' => $data], 'order_deliver_success']); break; case 3://虚拟发货 $this->orderVirtualDelivery($id, $data, $orderInfo, $storeName); @@ -453,6 +449,8 @@ class StoreOrderDeliveryServices extends BaseServices default: throw new AdminException(400522); } + //用户推送消息事件 + event('notice.notice', [['orderInfo' => $orderInfo, 'storeName' => $storeName, 'data' => $data], 'order_deliver_success']); event('order.delivery', [$orderInfo, $storeName, $data, $type]); return true; }