|
|
@@ -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;
|