...
|
...
|
@@ -629,7 +629,7 @@ trait OrderOper |
|
|
$user = User::info();
|
|
|
extract($params);
|
|
|
|
|
|
$order = (new self())->with('item')->where('user_id', $user->id);
|
|
|
$order = (new self())->withTrashed()->with('item')->where('user_id', $user->id);
|
|
|
|
|
|
if (isset($order_sn)) {
|
|
|
$order = $order->where('order_sn', $order_sn);
|
...
|
...
|
@@ -638,7 +638,7 @@ trait OrderOper |
|
|
$order = $order->where('id', $id);
|
|
|
}
|
|
|
|
|
|
$order = $order->withTrashed()->find();
|
|
|
$order = $order->find();
|
|
|
|
|
|
if (!$order) {
|
|
|
throw new Exception('订单不存在');
|
...
|
...
|
|