修改 获取患者优惠卷列表 ，增加问诊类型字段

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);
     }
 

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);
     }

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' => [ // 修改购物车药品数据

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();
         }

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;
         }