From d645c8659ee49c8380294d5a9bf3d08f3f89fd17 Mon Sep 17 00:00:00 2001 From: limiyun Date: Wed, 11 Dec 2019 12:10:07 +0000 Subject: [PATCH 1/2] fix bug with Coupon code --- app/Controllers/UserController.php | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/app/Controllers/UserController.php b/app/Controllers/UserController.php index 8e4436df..342ee793 100644 --- a/app/Controllers/UserController.php +++ b/app/Controllers/UserController.php @@ -1100,7 +1100,11 @@ class UserController extends BaseController $res['msg'] = '此优惠码无效'; return $response->getBody()->write(json_encode($res)); } - + if ($coupon->expire < time()) { + $res['ret'] = 0; + $res['msg'] = '优惠码已过期'; + return $response->getBody()->write(json_encode($res)); + } if ($coupon->order($shop->id) == false) { $res['ret'] = 0; $res['msg'] = '此优惠码不可用于此商品'; From e704107a5db8372496b70f66b08a82d6707964fc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AD=94=E9=9B=80?= Date: Wed, 11 Dec 2019 12:15:04 +0000 Subject: [PATCH 2/2] Update UserController.php --- app/Controllers/UserController.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/Controllers/UserController.php b/app/Controllers/UserController.php index 342ee793..e76a1165 100644 --- a/app/Controllers/UserController.php +++ b/app/Controllers/UserController.php @@ -1101,10 +1101,10 @@ class UserController extends BaseController return $response->getBody()->write(json_encode($res)); } if ($coupon->expire < time()) { - $res['ret'] = 0; + $res['ret'] = 0; $res['msg'] = '优惠码已过期'; return $response->getBody()->write(json_encode($res)); - } + } if ($coupon->order($shop->id) == false) { $res['ret'] = 0; $res['msg'] = '此优惠码不可用于此商品';