gdxz/hospital-applets-api
4
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
wucongxing 2023-11-08 09:32:28 +08:00
parent e9df0ebd74
commit 872edba2c4
6 changed files with 16 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
app/Controller/UserPatientController.php
View File

@ -43,13 +43,13 @@ class UserPatientController extends AbstractController
* @throws ContainerExceptionInterface * @throws ContainerExceptionInterface
* @throws NotFoundExceptionInterface * @throws NotFoundExceptionInterface
*/ */
public function getPatientCouponlist(): ResponseInterface public function getPatientCouponList(): ResponseInterface
{ {
$request = $this->container->get(UserPatientRequest::class); $request = $this->container->get(UserPatientRequest::class);
$request->scene('getPatientCouponlist')->validateResolved(); $request->scene('getPatientCouponList')->validateResolved();
$UserPatientService = new UserPatientService(); $UserPatientService = new UserPatientService();
$data = $UserPatientService->getPatientCouponlist(); $data = $UserPatientService->getPatientCouponList();
return $this->response->json($data); return $this->response->json($data);
} }

6
app/Model/UserCoupon.php
View File

@ -65,11 +65,11 @@ class UserCoupon extends Model
* @param array $fields * @param array $fields
* @return Collection|array * @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']) return self::with(['Coupon'])
->whereHas('Coupon' , function($query) use ($coupon_params,$application_scope_params){ ->whereHas('Coupon' , function($query){
$query->where($coupon_params)->whereIn('application_scope',$application_scope_params); $query->where("coupon_client",1)->where("coupon_status",1);
}) })
->where($params)->get($fields); ->where($params)->get($fields);
} }

2
app/Request/UserPatientRequest.php
View File

@ -10,7 +10,7 @@ use Hyperf\Validation\Request\FormRequest;
class UserPatientRequest extends FormRequest class UserPatientRequest extends FormRequest
{ {
protected array $scenes = [ protected array $scenes = [
'getPatientCouponlist' => [ // 获取患者优惠卷列表 'getPatientCouponList' => [ // 获取患者优惠卷列表
'user_coupon_status', 'user_coupon_status',
], ],
'putShoppingCart' => [ // 修改购物车药品数据 'putShoppingCart' => [ // 修改购物车药品数据

8
app/Services/UserCouponService.php
View File

@ -54,13 +54,7 @@ class UserCouponService extends BaseService
$params[] = ['user_id', '=', $user_id]; $params[] = ['user_id', '=', $user_id];
$params[] = ['user_coupon_status', '=', $user_coupon_status];// 状态（0:未使用 1:已使用 3:已过期） $params[] = ['user_coupon_status', '=', $user_coupon_status];// 状态（0:未使用 1:已使用 3:已过期）
$coupon_params = array(); $user_coupon = UserCoupon::getWithCouponList($params);
$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);
if (empty($user_coupon)) { if (empty($user_coupon)) {
return array(); return array();
} }

11
app/Services/UserPatientService.php
View File

@ -120,7 +120,7 @@ class UserPatientService extends BaseService
* 获取患者优惠卷列表 * 获取患者优惠卷列表
* @return array * @return array
*/ */
public function getPatientCouponlist(): array public function getPatientCouponList(): array
{ {
$user_info = $this->request->getAttribute("userInfo") ?? []; $user_info = $this->request->getAttribute("userInfo") ?? [];
@ -140,9 +140,11 @@ class UserPatientService extends BaseService
return fail(HttpEnumCode::HTTP_ERROR, "非法用户"); return fail(HttpEnumCode::HTTP_ERROR, "非法用户");
} }
$userCouponService = new UserCouponService(); // 获取优惠卷列表
$params = array();
$user_coupon = $userCouponService->getUserCouponStatusList($user_patient['user_id'],[1,2,3,4,5],$user_coupon_status); $params["user_id"] = $user_patient['user_id'];
$params["user_coupon_status"] = $user_coupon_status;// 状态（0:未使用 1:已使用 3:已过期）
$user_coupon = UserCoupon::getWithCouponList($params);
$result = []; $result = [];
foreach ($user_coupon as $item){ foreach ($user_coupon as $item){
@ -165,6 +167,7 @@ class UserPatientService extends BaseService
$data['coupon_name'] = $item['coupon']['coupon_name']; $data['coupon_name'] = $item['coupon']['coupon_name'];
$data['coupon_price'] = $item['coupon']['coupon_price']; $data['coupon_price'] = $item['coupon']['coupon_price'];
$data['application_scope'] = $item['coupon']['application_scope']; $data['application_scope'] = $item['coupon']['application_scope'];
$data['inquiry_type'] = $item['coupon']['inquiry_type'];
$result[] = $data; $result[] = $data;
} }

2
config/routes.php
View File

@ -238,7 +238,7 @@ Router::addGroup('/patient', function () {
// 我的福利 // 我的福利
Router::addGroup('/coupon', function () { Router::addGroup('/coupon', function () {
// 获取患者优惠卷列表 // 获取患者优惠卷列表
Router::get('', [UserPatientController::class, 'getPatientCouponlist']); Router::get('', [UserPatientController::class, 'getPatientCouponList']);
}); });
// 问诊 // 问诊