wupengfei 2 年之前
父节点
当前提交
177742ad16

+ 4 - 3
addons/shopro/library/traits/model/order/OrderOperSendGet.php

@@ -248,9 +248,10 @@ trait OrderOperSendGet
         \addons\shopro\model\OrderAction::operAdd($order, $item, $oper, $oper_type, $oper_iden . '发货订单');
 
         // 订单发货后
-        $hookData = ['order' => $order, 'item' => $item];
-        \think\Hook::listen('order_send_after', $hookData);
-
+        if($oper_type !== 'system') {
+            $hookData = ['order' => $order, 'item' => $item];
+            \think\Hook::listen('order_send_after', $hookData);
+        }
         return $item;
     }
 

+ 1 - 3
application/admin/controller/shopro/order/Order.php

@@ -591,10 +591,8 @@ class Order extends Base
         $express_name = $this->request->post('express_name', '');
         $express_code = $this->request->post('express_code', '');
         $express_no = $this->request->post('express_no', '');
-        return $this->success('发货成功');
         list($orderExpress, $needSubscribe) = $this->handleDeliveryAfter($order, $item_lists, $orderExpress, $express_name, $express_code, $express_no);
-
-       if ($needSubscribe) {
+        if ($needSubscribe) {
             $this->subscribeExpressInfo($express_code, $express_no, $orderExpress, $order);
         }