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