添加days字段

app/JsonRpc/OrderService.php

@@ -72,11 +72,16 @@ class OrderService implements OrderServiceInterface
             ->offset(($data['page']-1)*$data['pageSize'])
             ->get();
         }
-        
+        $startTime = strtotime($data['starttime']); 
+        $endTime = strtotime($data['endtime']); 
+        $time = ($endTime - $startTime)/(24 * 60 * 60);
+        $roundedValue = round($time, 2);
+        $days = number_format($roundedValue, 2, '.', ''); 
         $count = count($rep);
         $data = [
             'rows'=>$rep->toArray(),
-            'count'=>$count 
+            'count'=>$count,
+            'days' => $days 
         ];
         
         if(empty($rep)){
@@ -171,6 +176,13 @@ class OrderService implements OrderServiceInterface
         if(empty($data)){
             return Result::error("暂时没有符合您条件的广告位");
         }
+        $startTime = strtotime($data['starttime']); 
+        $endTime = strtotime($data['endtime']); 
+        $time = ($endTime - $startTime)/(24 * 60 * 60);
+        $roundedValue = round($time, 2);
+        $days = number_format($roundedValue, 2, '.', ''); 
+        $count = count($rep);
+        $result['days'] = $days;
         return Result::success($result);
    }
    /**
@@ -182,6 +194,11 @@ class OrderService implements OrderServiceInterface
     { 
         date_default_timezone_set('Asia/Shanghai');
         $time = time(); 
+        $startTime = strtotime($data['starttime']); 
+        $endTime = strtotime($data['endtime']); 
+        $con_time = ($endTime - $startTime)/(24 * 60 * 60); 
+        $roundedValue = round($con_time, 2);
+        $days = number_format($roundedValue, 2, '.', ''); 
         $timestamp = date('YmdHis',$time);
         $catetime = date('Y-m-d H:i:s',$time);
         $randomNumber = mt_rand(1000, 9999); 
@@ -194,7 +211,8 @@ class OrderService implements OrderServiceInterface
             'user_id' => $data['user_id'],
             'cttime' => $catetime,
             'height' => $data['height'],
-            'width' => $data['width']
+            'width' => $data['width'],
+            'days' => $days
 
         ];
         $orderid = Order::insertGetId($order);
@@ -245,6 +263,7 @@ class OrderService implements OrderServiceInterface
             // ];          
         }
         $orderad_id = OrderAd::insert($order_ad);
+       
         // $log = AdLog::insert($log);
         if(empty($orderid) || !$orderad_id){
             return Result::error("添加失败");
@@ -253,7 +272,7 @@ class OrderService implements OrderServiceInterface
             'order_id' => $orderid,
             'orderad_id' => $orderad_id,
             'name' => $data['name'],
-            'name' => $data['name'],
+            '$ordernum' => $ordernum,
         ];
         return Result::success($result);
     }
@@ -280,13 +299,6 @@ class OrderService implements OrderServiceInterface
         if(empty($orders)){
             return Result::error("您暂时还没有下单");
         }else{
-            foreach($orders as $key => $order){
-
-                $startTime = strtotime($order['sttime']); 
-                $endTime = strtotime($order['edtime']); 
-                $days = ($endTime - $startTime)/(24 * 60 * 60); 
-                $orders[$key]['days'] =  $days;
-            }
             $count = count($orders);
             $data = [
                 'rows'=>$orders->toArray(),
@@ -303,10 +315,6 @@ class OrderService implements OrderServiceInterface
     public function getOrderDetail(array $data): array
     {   
         $order = Order::where('id',$data['order_id'])->first();
-        $startTime = strtotime($order['sttime']); 
-        $endTime = strtotime($order['edtime']); 
-        $days = ($endTime - $startTime)/(24 * 60 * 60); 
-        $order['days'] = $days; 
         $orderads = OrderAd::where('order_ad.order_id',$data['order_id'])
         ->leftJoin('website','order_ad.website_id','website.id')
         ->select('order_ad.*','website.website_name','website.id')
@@ -335,9 +343,8 @@ class OrderService implements OrderServiceInterface
         date_default_timezone_set('Asia/Shanghai');
         $time = time(); 
         $timestamp = date('YmdHis',$time);
-        $time = ['edtime','>=',$timestamp];
-        $order = Order::where('id',$data['order_id'])->where('status',6)->where('edtime','<=',$timestamp)->update(['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('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]);
         if(!$order || !$ads){
             return Result::error("订单id错误");
         }
@@ -356,7 +363,9 @@ class OrderService implements OrderServiceInterface
     {   
         $data['status'] = [
             0 => 2,
-            1 => 3
+            1 => 3,
+            2 => 5,
+            3 => 7
         ];
         date_default_timezone_set('Asia/Shanghai');
         $time = time();