|
@@ -320,6 +320,12 @@ class OrderService implements OrderServiceInterface
|
|
|
Db::beginTransaction();
|
|
|
try {
|
|
|
$order->status = 1;
|
|
|
+ //判断是否在周期范围内
|
|
|
+ $ad_status = 8;// 待生效
|
|
|
+ if ($order->starttime < date('Y-m-d H:i:s') && date('Y-m-d H:i:s') < $order->endtime) {
|
|
|
+ // 条件满足时的逻辑
|
|
|
+ $ad_status = 1;
|
|
|
+ }
|
|
|
$order->ad_status = 1;
|
|
|
$order->shtime = date('Y-m-d H:i:s');
|
|
|
$order->save();
|
|
@@ -334,8 +340,8 @@ class OrderService implements OrderServiceInterface
|
|
|
} else {
|
|
|
$ad_status = 2; //审核
|
|
|
}
|
|
|
-
|
|
|
$ads = [];
|
|
|
+ $orderAds = $orderAds::where('order_id', $data['id'])->get();
|
|
|
foreach ($orderAds as $orderAd) {
|
|
|
$ads[] = [
|
|
|
'name' => $orderAd->name,
|