shish 8 ヶ月 前
コミット
ee62c17aa4

+ 2 - 2
common/components/delivery/platform/fengniao/CallBackNotify.php

@@ -58,7 +58,7 @@ class CallBackNotify
         $orderStatus = OrderStatusUtil::convertStatus($data['order_status']);
 
         if(isset($deliveryOrder->ghsOrderId)){ // 批发
-            util::checkRepeatCommit('ghs_'.$deliveryOrder->ghsOrderId.'_'.$sendStatus, 2); // 防止重复回调
+            util::checkRepeatCommit('ghs_pt_'.$deliveryOrder->ghsOrderId.'_'.$sendStatus, 2); // 防止重复回调
 
             $order = OrderClass::getById($deliveryOrder->ghsOrderId, true, 'id,sendType,sendStatus,deliveryId,purchaseId,customId,status');
             // 确认送达或取消订单,更新主订单状态
@@ -72,7 +72,7 @@ class CallBackNotify
             $order->status = $orderStatus;
             $order->save();
         }elseif(isset($deliveryOrder->hdOrderId)){ // 零售
-            util::checkRepeatCommit('hd_'.$deliveryOrder->hdOrderId.'_'.$sendStatus, 2); // 防止重复回调
+            util::checkRepeatCommit('hd_pt_'.$deliveryOrder->hdOrderId.'_'.$sendStatus, 2); // 防止重复回调
 
             $order = HdOrderClass::getById($deliveryOrder->hdOrderId, true, 'id,sendType,sendStatus,deliveryId,customId,status');
             $order->sendStatus = $sendStatus;

+ 2 - 2
common/components/delivery/platform/huolala/CallBackHandler.php

@@ -60,7 +60,7 @@ class CallBackHandler
 
 
             if(isset($deliveryOrder->ghsOrderId)){ // 批发
-                util::checkRepeatCommit('ghs_'.$deliveryOrder->ghsOrderId.'_'.$sendStatus, 2); // 防止重复回调
+                util::checkRepeatCommit('ghs_pt_'.$deliveryOrder->ghsOrderId.'_'.$sendStatus, 2); // 防止重复回调
 
                 $order = OrderClass::getById($deliveryOrder->ghsOrderId, true, 'id,sendStatus,deliveryId,purchaseId,customId,status');
                 if ($order) {
@@ -81,7 +81,7 @@ class CallBackHandler
                     Yii::warning('未找到主订单: ghsOrderId=' . $deliveryOrder->ghsOrderId, 'huolala-callback');
                 }
             }elseif(isset($deliveryOrder->hdOrderId)){ // 零售
-                util::checkRepeatCommit('hd_'.$deliveryOrder->hdOrderId.'_'.$sendStatus, 2); // 防止重复回调
+                util::checkRepeatCommit('hd_pt_'.$deliveryOrder->hdOrderId.'_'.$sendStatus, 2); // 防止重复回调
 
                 $order = HdOrderClass::getById($deliveryOrder->hdOrderId, true, 'id,sendType,sendStatus,deliveryId,customId,status');
                 if ($order) {

+ 2 - 2
common/components/delivery/platform/shansong/OrderStatusCallBack.php

@@ -61,7 +61,7 @@ class OrderStatusCallBack
             // 区分类别,然后更新主订单状态
             if(isset($deliveryOrder->ghsOrderId)){ // 批发
                 $type = '批发';
-                util::checkRepeatCommit('ghs_'.$deliveryOrder->ghsOrderId.'_'.$sendStatus, 2);// 防止重复回调
+                util::checkRepeatCommit('ghs_pt_'.$deliveryOrder->ghsOrderId.'_'.$sendStatus, 2);// 防止重复回调
                 $order = OrderClass::getById($deliveryOrder->ghsOrderId, true, 'id,sendType,sendStatus,deliveryId,purchaseId,customId,status');
 
                 if ($order) {
@@ -78,7 +78,7 @@ class OrderStatusCallBack
                 }
             }elseif(isset($deliveryOrder->hdOrderId)){ // 零售
                 $type = '零售';
-                util::checkRepeatCommit('hd_'.$deliveryOrder->hdOrderId.'_'.$sendStatus, 2);// 防止重复回调
+                util::checkRepeatCommit('hd_pt_'.$deliveryOrder->hdOrderId.'_'.$sendStatus, 2);// 防止重复回调
                 $order = HdOrderClass::getById($deliveryOrder->hdOrderId, true, 'id,sendType,sendStatus,deliveryId,customId,status');
                 $order->status = $orderStatus;
 

+ 2 - 2
common/components/delivery/platform/shunfeng/CallBackHandler.php

@@ -122,7 +122,7 @@ class CallBackHandler
 
         // 更新主订单
         if (isset($deliveryOrder->ghsOrderId)) { // 批发
-            util::checkRepeatCommit('ghs_' . $deliveryOrder->ghsOrderId . '_' . $sendStatus, 2);
+            util::checkRepeatCommit('ghs_pt_' . $deliveryOrder->ghsOrderId . '_' . $sendStatus, 2);
             $order = OrderClass::getById($deliveryOrder->ghsOrderId, true);
             if ($order) {
                 if ($extraHandler) {
@@ -134,7 +134,7 @@ class CallBackHandler
                 $order->save();
             }
         } elseif (isset($deliveryOrder->hdOrderId)) { // 零售
-            util::checkRepeatCommit('hd_' . $deliveryOrder->hdOrderId . '_' . $sendStatus, 2);
+            util::checkRepeatCommit('hd_pt_' . $deliveryOrder->hdOrderId . '_' . $sendStatus, 2);
             $order = HdOrderClass::getById($deliveryOrder->hdOrderId, true);
             if ($order) {
                 if ($extraHandler) {