diff --git a/app/Model/DoctorConfigHealthPackage.php b/app/Model/DoctorConfigHealthPackage.php index a30b92d..d0b2a97 100644 --- a/app/Model/DoctorConfigHealthPackage.php +++ b/app/Model/DoctorConfigHealthPackage.php @@ -13,7 +13,7 @@ use Hyperf\Snowflake\Concern\Snowflake; /** * @property int $health_package_id 主键id * @property int $doctor_id 医生id - * @property int $config_health_package_id 健康包配置id + * @property int $package_id 健康包配置id * @property string $service_price 服务价格（根据图文问诊价格计算） * @property Carbon $created_at 创建时间 * @property Carbon $updated_at 修改时间 @@ -30,7 +30,7 @@ class DoctorConfigHealthPackage extends Model /** * The attributes that are mass assignable. */ - protected array $fillable = ['health_package_id', 'doctor_id', 'config_health_package_id', 'service_price', 'created_at', 'updated_at']; + protected array $fillable = ['health_package_id', 'doctor_id', 'package_id', 'service_price', 'created_at', 'updated_at']; protected string $primaryKey = "health_package_id"; diff --git a/app/Model/ConfigHealthPackage.php b/app/Model/HealthPackage.php similarity index 73% rename from app/Model/ConfigHealthPackage.php rename to app/Model/HealthPackage.php index 84adc24..46ee69c 100644 --- a/app/Model/ConfigHealthPackage.php +++ b/app/Model/HealthPackage.php @@ -11,7 +11,7 @@ use Hyperf\Database\Model\Collection; use Hyperf\Snowflake\Concern\Snowflake; /** - * @property int $config_health_package_id 主键id + * @property int $package_id 主键id * @property int $service_count 总服务次数 * @property int $monthly_frequency 每月次数 * @property string $effective_days 服务有效天数 @@ -19,21 +19,21 @@ use Hyperf\Snowflake\Concern\Snowflake; * @property Carbon $created_at 创建时间 * @property Carbon $updated_at 修改时间 */ -class ConfigHealthPackage extends Model +class HealthPackage extends Model { use Snowflake; /** * The table associated with the model. */ - protected ?string $table = 'config_health_package'; + protected ?string $table = 'health_package'; /** * The attributes that are mass assignable. */ - protected array $fillable = ['config_health_package_id', 'service_count', 'monthly_frequency', 'effective_days', 'service_rate', 'created_at', 'updated_at']; + protected array $fillable = ['package_id', 'service_count', 'monthly_frequency', 'effective_days', 'service_rate', 'created_at', 'updated_at']; - protected string $primaryKey = "config_health_package_id"; + protected string $primaryKey = "package_id"; /** * 获取信息-单条 @@ -60,9 +60,9 @@ class ConfigHealthPackage extends Model /** * 新增 * @param array $data - * @return ConfigHealthPackage|\Hyperf\Database\Model\Model + * @return HealthPackage|\Hyperf\Database\Model\Model */ - public static function addConfigHealthPackage(array $data): \Hyperf\Database\Model\Model|ConfigHealthPackage + public static function addHealthPackage(array $data): \Hyperf\Database\Model\Model|HealthPackage { return self::create($data); } diff --git a/app/Model/HealthPackageProduct.php b/app/Model/HealthPackageProduct.php new file mode 100644 index 0000000..1740a3b --- /dev/null +++ b/app/Model/HealthPackageProduct.php @@ -0,0 +1,79 @@ +first($fields); + } + + /** + * 多条 + * @param array $params + * @param array $fields + * @return Collection|array + */ + public static function getList(array $params, array $fields = ['*']): Collection|array + { + return self::where($params)->get($fields); + } + + /** + * 新增 + * @param array $data + * @return HealthPackageProduct|\Hyperf\Database\Model\Model + */ + public static function addHealthPackageProduct(array $data): \Hyperf\Database\Model\Model|HealthPackageProduct + { + return self::create($data); + } + + /** + * 修改 + * @param array $params + * @param array $data + * @return int + */ + public static function edit(array $params = [], array $data = []): int + { + return self::where($params)->update($data); + } +} diff --git a/app/Services/DoctorInquiryService.php b/app/Services/DoctorInquiryService.php index 7e8e074..9cd38b0 100644 --- a/app/Services/DoctorInquiryService.php +++ b/app/Services/DoctorInquiryService.php @@ -4,7 +4,6 @@ namespace App\Services; use App\Constants\HttpEnumCode; use App\Exception\BusinessException; -use App\Model\ConfigHealthPackage; use App\Model\DoctorConfigDifficultConsultation; use App\Model\DoctorConfigFollowPackage; use App\Model\DoctorConfigFollowPackageItem; @@ -12,6 +11,7 @@ use App\Model\DoctorConfigHealthPackage; use App\Model\DoctorInquiryConfig; use App\Model\DoctorInquiryConfigService; use App\Model\DoctorInquiryPriceRecord; +use App\Model\HealthPackage; use App\Model\SystemInquiryConfig; use App\Model\UserDoctor; use Hyperf\DbConnection\Db; @@ -374,8 +374,8 @@ class DoctorInquiryService extends BaseService if ($inquiry_type == 1 || $inquiry_mode == 8){ // 获取健康包配置 $params = array(); - $config_health_package = ConfigHealthPackage::getOne($params); - if (empty($config_health_package)){ + $health_package = HealthPackage::getOne($params); + if (empty($health_package)){ Db::rollBack(); return fail(HttpEnumCode::SERVER_ERROR); } @@ -392,12 +392,12 @@ class DoctorInquiryService extends BaseService } // 价格计算(专家图文问诊价格*费率+30盒35元的干爽颗粒) - $service_price = $doctor_inquiry_config['inquiry_price'] * $config_health_package['service_rate'] / 100 * 6 + 35 * 30; + $service_price = $doctor_inquiry_config['inquiry_price'] * $health_package['service_rate'] / 100 * 6 + 35 * 30; // 创建医生健康包 $data = array(); $data['doctor_id'] = $user_info['client_user_id']; - $data['config_health_package_id'] = $config_health_package['config_health_package_id']; + $data['package_id'] = $health_package['package_id']; $data['service_price'] = $service_price; $doctor_config_health_package = DoctorConfigHealthPackage::addDoctorConfigHealthPackage($data); if (empty($doctor_config_health_package)){ @@ -1136,14 +1136,14 @@ class DoctorInquiryService extends BaseService // 获取健康包配置 $params = array(); - $config_health_package = ConfigHealthPackage::getOne($params); - if (empty($config_health_package)){ + $health_package = HealthPackage::getOne($params); + if (empty($health_package)){ return fail(HttpEnumCode::SERVER_ERROR); } $result = array(); - $result['service_count'] = $config_health_package['service_count']; // 总服务次数 - $result['service_rate'] = $config_health_package['service_rate']; // 服务费率。100为满值，表示1，正常费率。 + $result['service_count'] = $health_package['service_count']; // 总服务次数 + $result['service_rate'] = $health_package['service_rate']; // 服务费率。100为满值，表示1，正常费率。 $result['inquiry_price'] = $doctor_inquiry_config['inquiry_price']; // 专家问诊-图文接诊价格 return success($result); diff --git a/config/routes.php b/config/routes.php index 6d004e0..aecb032 100644 --- a/config/routes.php +++ b/config/routes.php @@ -578,6 +578,9 @@ Router::addGroup('/patient', function () { // 删除家庭成员病情记录 Router::delete('/{pathography_id:\d+}', [PatientPathographyController::class, 'deleteFamilyPathography']); }); + + // 获取用户购买的服务包 + }); // 药师端api