|
@@ -142,7 +142,14 @@ class OrderService implements OrderServiceInterface
|
|
|
'order.status' => $data['status'], // 明确指定 order 表的 status 列
|
|
|
];
|
|
|
}
|
|
|
-
|
|
|
+
|
|
|
+ //广告订单状态
|
|
|
+ if(!empty($data['ad_status'])){
|
|
|
+ $where = [
|
|
|
+ 'order.ad_status' => $data['ad_status'],
|
|
|
+ ];
|
|
|
+ }
|
|
|
+
|
|
|
// 添加订单号查询条件
|
|
|
if (!empty($data['order_num'])) {
|
|
|
$where['order.order_num'] = $data['order_num']; // 明确指定 order 表的 order_num 列
|
|
@@ -300,6 +307,8 @@ class OrderService implements OrderServiceInterface
|
|
|
}
|
|
|
Db::beginTransaction();
|
|
|
try {
|
|
|
+ Order::where('id', $data['id'])->delete();
|
|
|
+ var_dump(11111111);
|
|
|
// 获取 order_ad 表中的记录
|
|
|
OrderAd::where('order_id', $data['id'])->delete();
|
|
|
// 删除 ad 表中的记录
|