|
|
@@ -242,7 +242,7 @@ class CallBackHandler
|
|
|
if (!in_array($order->sendStatus, [-2, -1]) && in_array($sendStatus, [-1, -2])) {
|
|
|
OrderClass::cancelOrderSend($order, ['staffId' => 0, 'staffName' => '']);
|
|
|
// 取消费用设置与保存
|
|
|
- if($sendStatus == -1 && isset($data['cancelInfo'])){
|
|
|
+ if($sendStatus == -1 && isset($data['cancelInfo']) && isset($data['cancelInfo']['cancelFee'])){
|
|
|
$deliveryOrder->cancelCost = $data['cancelCost']['cancelFee'];
|
|
|
}
|
|
|
$event = $this->cancelFrom($data);
|
|
|
@@ -268,7 +268,7 @@ class CallBackHandler
|
|
|
|
|
|
if (!in_array($order->sendStatus, [-2, -1]) && in_array($sendStatus, [-1, -2])) {
|
|
|
// 取消费用设置与保存
|
|
|
- if($sendStatus == -1 && isset($data['cancelInfo'])){
|
|
|
+ if($sendStatus == -1 && isset($data['cancelInfo']) && isset($data['cancelInfo']['cancelFee'])){
|
|
|
$deliveryOrder->cancelCost = $data['cancelCost']['cancelFee'];
|
|
|
}
|
|
|
$event = $this->cancelFrom($data);
|