1.表xhGhsOrder 的sendStatus 与 xhGhsDeliveryOrder 的 orderStatus 要在一个地方统一更新 2.fix bug: xhOrder表不存在 sendTip 字段

app-hd/controllers/DeliveryController.php

@@ -279,22 +279,23 @@ class DeliveryController extends BaseController
         $post['order_cancel_role'] = 1; //1:商户取消, 2:用户取消
         $ret = $ds->cancelOrder($orderId, $post);
         if ($ret['code'] == 0) {
-            // 更新跑腿订单与批发订单状态
-            $hdo->orderStatus = -1;
+            $Order = OrderClass::getById($hdOrderId, true, 'id, sendDistance, sendStatus, deliveryId');
+            $Order->sendDistance = 0;
+            if(in_array($platform, ['shunfeng'])){ // 测试发现取消配送没回调的平台，统一在这主动更新配送状态
+                $Order->sendStatus = -1;
+
+                // 更新跑腿订单与批发订单状态
+                $hdo->orderStatus = -1;
+            }
             $hdo->cancelCost = $ret['platform'] !== 'fengniao' ? $ret['data']['deductionFee'] : $cancelCostCent; // 由于蜂鸟平台返回的扣费不一样造成
             if (!$hdo->save()) {
                 Yii::error('保存配送订单失败: ' . json_encode($hdo->errors));
                 util::fail('保存配送订单失败');
             }
 
-            $Order = OrderClass::getById($hdOrderId, true, 'id, sendDistance, sendStatus, deliveryId');
-            $Order->sendDistance = 0;
-            if(in_array($platform, ['shunfeng'])){ // 测试发现取消配送没回调的平台，统一在这主动更新配送状态
-                $Order->sendStatus = -1;
-            }
             $Order->status = 2;
             //$Order->deliveryId = '';
-            $Order->sendTip = 0;
+            //$Order->sendTip = 0;
             if (!$Order->save()) {
                 Yii::error('保存批发订单失败: ' . json_encode($Order->errors));
                 util::fail('保存批发订单失败');