From 2e1071205e406c014e306724328c800a9478d002 Mon Sep 17 00:00:00 2001 From: weigang Date: Sat, 18 Jul 2020 20:58:53 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E5=89=94=E9=99=A4=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/Controller/CouponController.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/Controller/CouponController.php b/app/Controller/CouponController.php index aa8739f..8c60721 100644 --- a/app/Controller/CouponController.php +++ b/app/Controller/CouponController.php @@ -231,7 +231,7 @@ class CouponController extends BaseController foreach ($data as $key => &$item) { if (in_array($item->id, $couponIds)) { $notAvailable[] = $item; - unset($item); + unset($data[$key]); } } From 62fe8af6ee301af0591698555b28bff213c8f0f4 Mon Sep 17 00:00:00 2001 From: weigang Date: Sat, 18 Jul 2020 21:14:02 +0800 Subject: [PATCH 2/2] Fixed --- app/Controller/CouponController.php | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/app/Controller/CouponController.php b/app/Controller/CouponController.php index e9a9eec..5d4d945 100644 --- a/app/Controller/CouponController.php +++ b/app/Controller/CouponController.php @@ -225,16 +225,18 @@ class CouponController extends BaseController $redis = $container->get(Redis::class); $couponIds = $redis->sMembers('coupon_'.date('Ymd').'_used_'.$userId); + $available = []; $notAvailable = []; foreach ($data as $key => &$item) { if (in_array($item->id, $couponIds)) { $notAvailable[] = $item; - unset($data[$key]); + } else { + $available[] = $item; } } return $this->success([ - 'available' => $data, + 'available' => $available, 'not_available' => $notAvailable ]);