|
@@ -635,8 +635,8 @@ class OrderService implements OrderServiceInterface
|
|
|
$timestamp = date('YmdHis', $time);
|
|
|
Db::beginTransaction();
|
|
|
try {
|
|
|
- $order = Order::where('id', $data['order_id'])->where('status', 6)->where('edtime', '>=', $timestamp)->update(['status' => 3, 'ad_status' => '3']);
|
|
|
- $ads = OrderAd::where('order_id', $data['order_id'])->where('status', 6)->where('totime', '>=', $timestamp)->update(['status' => 3]);
|
|
|
+ $order = Order::where('id', $data['order_id'])->where('status', 6)->where('sttime', '>=', $timestamp)->update(['status' => 3, 'ad_status' => '3']);
|
|
|
+ $ads = OrderAd::where('order_id', $data['order_id'])->where('status', 6)->where('fromtime', '>=', $timestamp)->update(['status' => 3]);
|
|
|
Db::commit();
|
|
|
} catch (\Exception $e) {
|
|
|
Db::rollBack();
|
|
@@ -659,8 +659,9 @@ class OrderService implements OrderServiceInterface
|
|
|
0 => 2,
|
|
|
1 => 3,
|
|
|
2 => 5,
|
|
|
- 3 => 7,
|
|
|
+ 3 => 7
|
|
|
];
|
|
|
+ //1:通过;2:驳回;3:撤回;4:修改;5:过期;6:待审核;7:结束;
|
|
|
date_default_timezone_set('Asia/Shanghai');
|
|
|
$time = time();
|
|
|
$timestamp = date('YmdHis', $time);
|