diff --git a/app/Controller/CallBackController.php b/app/Controller/CallBackController.php index aaec5f0..602a521 100644 --- a/app/Controller/CallBackController.php +++ b/app/Controller/CallBackController.php @@ -35,6 +35,7 @@ use App\Model\OrderProductLogistic; use App\Model\OrderProductRefund; use App\Model\OrderServicePackage; use App\Model\OrderServicePackageCase; +use App\Model\OrderServicePackageInquiry; use App\Model\PatientFamily; use App\Model\PatientFamilyHealth; use App\Model\PatientFamilyPersonal; @@ -2720,6 +2721,20 @@ class CallBackController extends AbstractController return $server->serve(); } + // 新增服务包关联订单 + $data = array(); + $data['order_service_id'] = $order_service_package['order_service_id']; + $data['order_inquiry_id'] = $order_inquiry['order_inquiry_id']; + $data['order_service_no'] = $order_service_package['order_service_no']; + $data['inquiry_no'] = $order_inquiry['inquiry_no']; + $data['inquiry_status'] = $order_inquiry['inquiry_status']; + $order_service_package_inquiry = OrderServicePackageInquiry::addOrderServicePackageInquiry($data); + if (empty($order_service_package_inquiry)){ + Db::rollBack(); + Log::getInstance("CallBack-wxPayServiceSuccess")->error("订单创建失败"); + return $server->serve(); + } + // 加入未接诊取消订单延迟队列 $time = 60 * 60 * 24; if (\Hyperf\Config\config('app_env') == "dev"){ diff --git a/app/Services/OrderServicePackageService.php b/app/Services/OrderServicePackageService.php index 6c5c43c..6406b15 100644 --- a/app/Services/OrderServicePackageService.php +++ b/app/Services/OrderServicePackageService.php @@ -21,6 +21,7 @@ use App\Model\OrderInquiryCoupon; use App\Model\OrderServicePackage; use App\Model\OrderServicePackageCase; use App\Model\OrderServicePackageDetail; +use App\Model\OrderServicePackageInquiry; use App\Model\PatientFamily; use App\Model\PatientFamilyHealth; use App\Model\PatientFamilyPersonal; @@ -619,8 +620,6 @@ class OrderServicePackageService extends BaseService $order_no = $this->request->input("order_no"); try { - - // 检测患者是否购买服务包 $params = array(); $params['user_id'] = $user_info['user_id']; @@ -932,6 +931,19 @@ class OrderServicePackageService extends BaseService return fail(HttpEnumCode::HTTP_ERROR, "订单创建失败"); } + // 新增服务包关联订单 + $data = array(); + $data['order_service_id'] = $order_service_package['order_service_id']; + $data['order_inquiry_id'] = $order_inquiry['order_inquiry_id']; + $data['order_service_no'] = $order_service_package['order_service_no']; + $data['inquiry_no'] = $order_inquiry['inquiry_no']; + $data['inquiry_status'] = $order_inquiry['inquiry_status']; + $order_service_package_inquiry = OrderServicePackageInquiry::addOrderServicePackageInquiry($data); + if (empty($order_service_package_inquiry)){ + Db::rollBack(); + return fail(HttpEnumCode::HTTP_ERROR, "订单创建失败"); + } + // 加入未接诊取消订单延迟队列 $time = 60 * 60 * 24; if (\Hyperf\Config\config('app_env') == "dev"){