测试发现取消配送没回调的平台，统一在在取消配送API中更新配送状态

app-ghs/controllers/DeliveryController.php

@@ -427,7 +427,9 @@ class DeliveryController extends BaseController
 
             $ghsOrder = OrderClass::getById($ghsOrderId, true, 'id, sendDistance, sendStatus, deliveryId, purchaseId, status');
             $ghsOrder->sendDistance = 0;
-            //$ghsOrder->sendStatus = -1;
+            if(in_array($platform, ['shunfeng'])){ // 测试发现取消配送没回调的平台，统一在这主动更新配送状态
+                $ghsOrder->sendStatus = -1;
+            }
             // $ghsOrder->deliveryId = ''; // 为了获取上一次的配送记录，不要置空
             $ghsOrder->sendTip = 0;
             if (!$ghsOrder->save()) {

app-hd/controllers/DeliveryController.php

@@ -289,7 +289,9 @@ class DeliveryController extends BaseController
 
             $Order = OrderClass::getById($hdOrderId, true, 'id, sendDistance, sendStatus, deliveryId');
             $Order->sendDistance = 0;
-            //$Order->sendStatus = -1;
+            if(in_array($platform, ['shunfeng'])){ // 测试发现取消配送没回调的平台，统一在这主动更新配送状态
+                $Order->sendStatus = -1;
+            }
             $Order->status = 2;
             //$Order->deliveryId = '';
             $Order->sendTip = 0;

common/components/delivery/platform/shunfeng/CallBackHandler.php

@@ -405,7 +405,7 @@ class CallBackHandler
         $deliveryOrder = GhsDeliveryOrderClass::getByCondition([
             'deliveryId' => 'shunfeng',
             'orderId' => $orderId
-        ], true);
+        ], true, 'id DESC');
 
         if ($deliveryOrder) {
             return $deliveryOrder;
@@ -415,7 +415,7 @@ class CallBackHandler
         return HdDeliveryOrderClass::getByCondition([
             'deliveryId' => 'shunfeng',
             'orderId' => $orderId
-        ], true);
+        ], true, 'id DESC');
     }
 
     private function cancelFrom($sendStatus, $cancelCode = 0)