diff --git a/app/Controller/Api/CouponController.php b/app/Controller/Api/CouponController.php index 781e8a7..3861d6d 100644 --- a/app/Controller/Api/CouponController.php +++ b/app/Controller/Api/CouponController.php @@ -30,6 +30,11 @@ class CouponController extends AbstractController return (new HomePopupsService)->handle(); } + /** + * @return array + */ + #[RequestMapping(path: "receive", methods: "POST")] + #[Scene(scene: "receive")] public function receiveCoupon() { return (new ReceiveService)->handle(); diff --git a/app/Service/Api/Coupon/ReceiveService.php b/app/Service/Api/Coupon/ReceiveService.php index 4575ad2..a547ac1 100644 --- a/app/Service/Api/Coupon/ReceiveService.php +++ b/app/Service/Api/Coupon/ReceiveService.php @@ -48,7 +48,7 @@ class ReceiveService extends BaseService $userBag = $this->userCouponModel->getReceiveCountByUserIds($this->userId, $idArr); - if (count(array_diff(array_column($couponArr, 'id'), $userBag)) != $couponArr) throw new ErrException('优惠券已领完'); + if (count(array_diff(array_column($couponArr, 'id'), $userBag)) != count($couponArr)) throw new ErrException('优惠券已领完'); $this->receive($couponArr); @@ -112,7 +112,7 @@ class ReceiveService extends BaseService ]; } - if (empty($allUpdateData)) return; + if (empty($this->allUpdateData) || empty($this->insertData)) return; $this->matters(); }