|
@@ -673,15 +673,13 @@ class OrderService implements OrderServiceInterface
|
|
|
$time = time();
|
|
|
$timestamp = date('YmdHis', $time);
|
|
|
$where = [
|
|
|
- ['user_id', '=', $data['user_id']],
|
|
|
- ['id', '=', $data['order_id']],
|
|
|
+ ['id', '=', $data['id']],
|
|
|
];
|
|
|
$time = [['edtime', '<=', $timestamp]];
|
|
|
$order = Order::where($where)->where($time)->update(['user_del' => 1]);
|
|
|
if (empty($order)) {
|
|
|
$order = Order::where($where)->whereIn('status', $data['status'])->update(['user_del' => 1]);
|
|
|
}
|
|
|
- //
|
|
|
if ($order == 0) {
|
|
|
return Result::error("此订单不可删除");
|
|
|
}
|