|
|
@ -326,8 +326,7 @@ class Order extends OrderModel |
|
|
|
*/ |
|
|
|
*/ |
|
|
|
public function updateDelivery(array $data): bool |
|
|
|
public function updateDelivery(array $data): bool |
|
|
|
{ |
|
|
|
{ |
|
|
|
if ($this['pay_status'] != PayStatusEnum::SUCCESS |
|
|
|
if ($this['delivery_status'] == DeliveryStatusEnum::DELIVERED || $this['delivery_type'] != 10) { |
|
|
|
|| $this['delivery_status'] == DeliveryStatusEnum::DELIVERED || $this['delivery_type'] != 10) { |
|
|
|
|
|
|
|
$this->error = "订单号[{$this['order_no']}]不满足修改条件!"; |
|
|
|
$this->error = "订单号[{$this['order_no']}]不满足修改条件!"; |
|
|
|
return false; |
|
|
|
return false; |
|
|
|
} |
|
|
|
} |
|
|
|