diff --git a/app/Model/HealthPackageProduct.php b/app/Model/HealthPackageProduct.php index d745282..23190a8 100644 --- a/app/Model/HealthPackageProduct.php +++ b/app/Model/HealthPackageProduct.php @@ -14,6 +14,7 @@ use Hyperf\Snowflake\Concern\Snowflake; * @property int $package_product_id 主键id * @property int $package_id 健康包id * @property int $product_id 商品id + * @property string $product_name 商品名称 * @property int $quantity 数量 * @property string $discount_product_price 折扣商品价格 * @property \Carbon\Carbon $created_at 创建时间 @@ -31,7 +32,7 @@ class HealthPackageProduct extends Model /** * The attributes that are mass assignable. */ - protected array $fillable = ['package_product_id', 'package_id', 'product_id', 'quantity', 'discount_product_price', 'created_at', 'updated_at']; + protected array $fillable = ['package_product_id', 'package_id', 'product_id', 'product_name', 'quantity', 'discount_product_price', 'created_at', 'updated_at']; protected string $primaryKey = "package_product_id"; diff --git a/app/Services/PatientOrderService.php b/app/Services/PatientOrderService.php index 75ddb62..7273ed0 100644 --- a/app/Services/PatientOrderService.php +++ b/app/Services/PatientOrderService.php @@ -32,6 +32,7 @@ use App\Model\OrderProductLogistic; use App\Model\OrderServicePackage; use App\Model\OrderServicePackageCase; use App\Model\OrderServicePackageDetail; +use App\Model\OrderServicePackageInquiry; use App\Model\OrderServicePackageProduct; use App\Model\OrderServicePackageRefund; use App\Model\PatientFamily; @@ -2728,25 +2729,44 @@ class PatientOrderService extends BaseService $result['order_inquiry'] = []; // 健康包问诊订单数据 $result['order_product'] = []; // 健康包药品订单数据 - - // 健康包商品数据 + // 健康包数据 if ($order_service_package['order_service_type'] == 1){ + // 健康包商品数据 $params = array(); $params['order_service_id'] = $order_service_package['order_service_id']; $order_service_package_product = OrderServicePackageProduct::getList($params); - if (empty($order_service_package_product)){ - return fail(); + if (!empty($order_service_package_product)){ + $result['order_service_package_product'] = $order_service_package_product->toArray(); + } + + // 健康包关联优惠卷数据 + if (in_array($order_service_package['order_service_status'],[3,4,5])){ + // 订单状态(1:待支付 2:未开始 3:服务中 4:服务完成 5:服务取消) + // 获取用户优惠卷 + $coupon = UserCoupon::getUserObjectTypeCoupon($order_service_package['user_id'],7); + if (!empty($coupon)){ + $result['order_service_package_coupon'] = $coupon->toArray(); + } + } + + // 健康包问诊订单数据 + if (in_array($order_service_package['order_service_status'],[2,3,4,5])){ + // 订单状态(1:待支付 2:未开始 3:服务中 4:服务完成 5:服务取消) + $params = array(); + $params['order_service_id'] = $order_service_package['order_service_id']; + $order_service_package_inquiry = OrderServicePackageInquiry::getList($params); + if (!empty($order_service_package_inquiry)){ + $result['order_inquiry'] = $order_service_package_inquiry->toArray(); + } + } + + // 健康包药品订单数据 + if (in_array($order_service_package['order_service_status'],[3,4,5])){ + } } - // 健康包关联优惠卷数据 - if (in_array($order_service_package['order_service_status'],[3,4,5])){ - // 订单状态(1:待支付 2:未开始 3:服务中 4:服务完成 5:服务取消) - // 获取用户优惠卷 - - } - - return success($order_service_package_detail->toArray()); + return success($result); } /**