配送优化

app-ghs/controllers/IntraCityController.php

@@ -827,8 +827,8 @@ class IntraCityController extends BaseController
                         $cg->save();
                         $params = ['staffId' => 0, 'staffName' => ''];
                         OrderClass::cancelOrderSend($order, $params);
+                        $msg = '取消配送，订单编号 ';
                     }
-                    $msg = '取消配送，订单编号 ';
                     break;
                 // 配送方取消订单
                 case IntraCityExpress::ORDER_STATUS_CANCELED_BY_DELIVERY:
@@ -843,8 +843,8 @@ class IntraCityController extends BaseController
                         $cg->save();
                         $params = ['staffId' => 0, 'staffName' => ''];
                         OrderClass::cancelOrderSend($order, $params);
+                        $msg = '配送方取消配送，订单编号 ';
                     }
-                    $msg = '配送方取消配送，订单编号 ';
                     break;
                 // 配送员撤单
                 case IntraCityExpress::ORDER_STATUS_WITHDRAWN:
@@ -864,8 +864,8 @@ class IntraCityController extends BaseController
                         $cg->save();
                         $params = ['staffId' => 0, 'staffName' => ''];
                         OrderClass::cancelOrderSend($order, $params);
+                        $msg = '订单配送异常，订单编号 ';
                     }
-                    $msg = '订单配送异常，订单编号 ';
                     break;
             }
             // ====================== 事务提交

app-hd/controllers/IntraCityController.php

@@ -709,8 +709,8 @@ class IntraCityController extends BaseController
                         $order->status = 2;//取消配送
                         $order->sendStatus = 3;//取消配送
                         $order->save();
+                        $msg = '取消配送，订单编号 ';
                     }
-                    $msg = '取消配送，订单编号 ';
                     break;
                 // 配送员撤单
                 case IntraCityExpress::ORDER_STATUS_WITHDRAWN:
@@ -726,8 +726,8 @@ class IntraCityController extends BaseController
                         $order->status = 2;//取消配送
                         $order->sendStatus = 3;//取消配送
                         $order->save();
+                        $msg = '配送方取消配送，订单编号 ';
                     }
-                    $msg = '配送方取消配送，订单编号 ';
                     break;
                 // 配送异常
                 case IntraCityExpress::ORDER_STATUS_EXCEPTION:
@@ -738,8 +738,8 @@ class IntraCityController extends BaseController
                         $order->status = 2;//取消配送
                         $order->sendStatus = 3;//取消配送
                         $order->save();
+                        $msg = '订单配送异常，订单编号 ';
                     }
-                    $msg = '订单配送异常，订单编号 ';
                     break;
             }
             if (empty($msg)) { // $msg 不为空，则发通知