From 872edba2c4656fe2368c50b329153f19335214e9 Mon Sep 17 00:00:00 2001 From: wucongxing <815046773@qq.com> Date: Wed, 8 Nov 2023 09:32:28 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=20=E8=8E=B7=E5=8F=96?= =?UTF-8?q?=E6=82=A3=E8=80=85=E4=BC=98=E6=83=A0=E5=8D=B7=E5=88=97=E8=A1=A8?= =?UTF-8?q?=20=EF=BC=8C=E5=A2=9E=E5=8A=A0=E9=97=AE=E8=AF=8A=E7=B1=BB?= =?UTF-8?q?=E5=9E=8B=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/Controller/UserPatientController.php | 6 +++--- app/Model/UserCoupon.php | 6 +++--- app/Request/UserPatientRequest.php | 2 +- app/Services/UserCouponService.php | 8 +------- app/Services/UserPatientService.php | 11 +++++++---- config/routes.php | 2 +- 6 files changed, 16 insertions(+), 19 deletions(-) diff --git a/app/Controller/UserPatientController.php b/app/Controller/UserPatientController.php index 1737e28..d3b6a54 100644 --- a/app/Controller/UserPatientController.php +++ b/app/Controller/UserPatientController.php @@ -43,13 +43,13 @@ class UserPatientController extends AbstractController * @throws ContainerExceptionInterface * @throws NotFoundExceptionInterface */ - public function getPatientCouponlist(): ResponseInterface + public function getPatientCouponList(): ResponseInterface { $request = $this->container->get(UserPatientRequest::class); - $request->scene('getPatientCouponlist')->validateResolved(); + $request->scene('getPatientCouponList')->validateResolved(); $UserPatientService = new UserPatientService(); - $data = $UserPatientService->getPatientCouponlist(); + $data = $UserPatientService->getPatientCouponList(); return $this->response->json($data); } diff --git a/app/Model/UserCoupon.php b/app/Model/UserCoupon.php index 1be4df0..15fde87 100644 --- a/app/Model/UserCoupon.php +++ b/app/Model/UserCoupon.php @@ -65,11 +65,11 @@ class UserCoupon extends Model * @param array $fields * @return Collection|array */ - public static function getWithCouponList(array $params,array $coupon_params,array $application_scope_params, array $fields = ['*']): Collection|array + public static function getWithCouponList(array $params,array $fields = ['*']): Collection|array { return self::with(['Coupon']) - ->whereHas('Coupon' , function($query) use ($coupon_params,$application_scope_params){ - $query->where($coupon_params)->whereIn('application_scope',$application_scope_params); + ->whereHas('Coupon' , function($query){ + $query->where("coupon_client",1)->where("coupon_status",1); }) ->where($params)->get($fields); } diff --git a/app/Request/UserPatientRequest.php b/app/Request/UserPatientRequest.php index 3618d1c..bdea314 100644 --- a/app/Request/UserPatientRequest.php +++ b/app/Request/UserPatientRequest.php @@ -10,7 +10,7 @@ use Hyperf\Validation\Request\FormRequest; class UserPatientRequest extends FormRequest { protected array $scenes = [ - 'getPatientCouponlist' => [ // 获取患者优惠卷列表 + 'getPatientCouponList' => [ // 获取患者优惠卷列表 'user_coupon_status', ], 'putShoppingCart' => [ // 修改购物车药品数据 diff --git a/app/Services/UserCouponService.php b/app/Services/UserCouponService.php index 1a383eb..a383f88 100644 --- a/app/Services/UserCouponService.php +++ b/app/Services/UserCouponService.php @@ -54,13 +54,7 @@ class UserCouponService extends BaseService $params[] = ['user_id', '=', $user_id]; $params[] = ['user_coupon_status', '=', $user_coupon_status];// 状态（0:未使用 1:已使用 3:已过期） - $coupon_params = array(); - $coupon_params[] = ['coupon_client', '=', 1]; - $coupon_params[] = ['coupon_status', '=', 1]; // 状态（1:正常 2:强制失效 3:结束 4:删除） - - $application_scope_params = $inquiry_type; // 适用范围（1:全部 2:快速问诊 3:专家问诊 4:公益问诊 5:问诊购药） - - $user_coupon = UserCoupon::getWithCouponList($params, $coupon_params, $application_scope_params); + $user_coupon = UserCoupon::getWithCouponList($params); if (empty($user_coupon)) { return array(); } diff --git a/app/Services/UserPatientService.php b/app/Services/UserPatientService.php index 91d9da0..6363d9f 100644 --- a/app/Services/UserPatientService.php +++ b/app/Services/UserPatientService.php @@ -120,7 +120,7 @@ class UserPatientService extends BaseService * 获取患者优惠卷列表 * @return array */ - public function getPatientCouponlist(): array + public function getPatientCouponList(): array { $user_info = $this->request->getAttribute("userInfo") ?? []; @@ -140,9 +140,11 @@ class UserPatientService extends BaseService return fail(HttpEnumCode::HTTP_ERROR, "非法用户"); } - $userCouponService = new UserCouponService(); - - $user_coupon = $userCouponService->getUserCouponStatusList($user_patient['user_id'],[1,2,3,4,5],$user_coupon_status); + // 获取优惠卷列表 + $params = array(); + $params["user_id"] = $user_patient['user_id']; + $params["user_coupon_status"] = $user_coupon_status;// 状态（0:未使用 1:已使用 3:已过期） + $user_coupon = UserCoupon::getWithCouponList($params); $result = []; foreach ($user_coupon as $item){ @@ -165,6 +167,7 @@ class UserPatientService extends BaseService $data['coupon_name'] = $item['coupon']['coupon_name']; $data['coupon_price'] = $item['coupon']['coupon_price']; $data['application_scope'] = $item['coupon']['application_scope']; + $data['inquiry_type'] = $item['coupon']['inquiry_type']; $result[] = $data; } diff --git a/config/routes.php b/config/routes.php index d9a0b37..6be0c8f 100644 --- a/config/routes.php +++ b/config/routes.php @@ -238,7 +238,7 @@ Router::addGroup('/patient', function () { // 我的福利 Router::addGroup('/coupon', function () { // 获取患者优惠卷列表 - Router::get('', [UserPatientController::class, 'getPatientCouponlist']); + Router::get('', [UserPatientController::class, 'getPatientCouponList']); }); // 问诊