wesley 7 år sedan
förälder
incheckning
8c698e8649
1 ändrade filer med 6 tillägg och 2 borttagningar
  1. 6 2
      app/Http/Controllers/Api/V1/HomeController.php

+ 6 - 2
app/Http/Controllers/Api/V1/HomeController.php

xqd xqd
@@ -1074,7 +1074,8 @@ class HomeController extends Controller
                 return false;
             }
             if (strtotime($value->coupon->end_time) < strtotime(Carbon::now('Asia/Shanghai'))) {
-                return false;
+                $value->status = 2;
+                return true;
             } else {
                 $value->coupon->product = CouponInfoModel::find($value->coupon->id) ? CouponInfoModel::find($value->coupon->id)->product() : '';
                 return true;
@@ -1084,9 +1085,12 @@ class HomeController extends Controller
         $mycoupons = $mycoupons->toArray();
         $mycoupons = array_values($mycoupons);
 
-        $mycards = CardInfoModel::where('user_id', $user->id)->where('status', 1)->where('end_time', '>', now())->get();
+        $mycards = CardInfoModel::where('user_id', $user->id)->get();
         foreach ($mycards as $card) {
             $card->product = $card->product();
+            if($card->end_time < now()){
+                $card->status = 2;
+            }
         }
         return $this->api(compact('mycards', 'mycoupons'));
     }