|
|
@@ -406,8 +406,8 @@ class WholeController extends Curd
|
|
|
|
|
|
$order = Order::where('order_id', $params['order_id'])
|
|
|
->where('order_status_system', 'CANCEL')
|
|
|
- ->orWhere(function ($query) {
|
|
|
- $query->whereIn('order_status_system', ['WAITING', 'SENDING'])->where('order_category', 'SYSTEM');
|
|
|
+ ->orWhere(function ($query) use ($params) {
|
|
|
+ $query->whereIn('order_status_system', ['WAITING', 'SENDING'])->where('order_category', 'SYSTEM')->where('order_id', $params['order_id']);
|
|
|
})
|
|
|
->first();
|
|
|
if (!$order) {
|
|
|
@@ -441,7 +441,7 @@ class WholeController extends Curd
|
|
|
// 删订单详情
|
|
|
OrderSheet::where('join_sheet_order_id', $params['order_id'])->delete();
|
|
|
// 删主订单
|
|
|
- $order->delete();
|
|
|
+ Order::where('order_id', $params['order_id'])->delete();
|
|
|
|
|
|
Db::commit();
|
|
|
|
gorden