新增检测回调、修改自动完成订单、新增im推送、

This commit is contained in:
2023-08-09 11:27:56 +08:00
parent 00937e9154
commit 3bb279ab57
9 changed files with 402 additions and 28 deletions
+32 -17
View File
@@ -15,6 +15,7 @@ use App\Model\OrderDetection;
use App\Model\OrderDetectionCase;
use App\Model\OrderDetectionRefund;
use App\Model\PatientFamily;
use App\Model\ReportDetection;
use App\Model\UserDoctor;
use App\Model\UserLocation;
use App\Utils\Log;
@@ -493,7 +494,10 @@ class DetectionService extends BaseService
return success($order_detection['detection_no']);
}
// 绑定检测管
/**
* 绑定检测管
* @return array
*/
public function bindDetectionTube(): array
{
$user_info = $this->request->getAttribute("userInfo") ?? [];
@@ -502,10 +506,6 @@ class DetectionService extends BaseService
$request_params = $this->request->all();
if (count($request_params['detection_pic']) < 1){
return fail(HttpEnumCode::HTTP_ERROR,"请上传检测管图片");
}
$params = array();
$params['patient_id'] = $user_info['client_user_id'];
$params['order_detection_id'] = $order_detection_id;
@@ -527,24 +527,39 @@ class DetectionService extends BaseService
return fail(HttpEnumCode::HTTP_ERROR,"请勿重复绑定");
}
if (!empty($order_detection['detection_pic'])){
if (!empty($order_detection['detection_pic']) && !empty($request_params['detection_pic'])){
return fail(HttpEnumCode::HTTP_ERROR,"请勿重复绑定");
}
// 处理检测管图片
$detection_pic = implode(',', $request_params['detection_pic']);
$detection_pic = PcreMatch::pregRemoveOssWebsite($detection_pic);
if (!empty($request_params['detection_pic'])){
$detection_pic = implode(',', $request_params['detection_pic']);
$detection_pic = PcreMatch::pregRemoveOssWebsite($detection_pic);
}
$data = array();
$data['detection_pic'] = $detection_pic;
$data['detection_bar_code'] = $request_params['detection_bar_code'];
$data['detection_status'] = 3;
$params = array();
$params['order_detection_id'] = $order_detection_id;
$res = OrderDetection::editOrderDetection($params,$data);
if (!$res){
return fail(HttpEnumCode::HTTP_ERROR,"绑定失败");
Db::beginTransaction();
try {
// 修改检测订单
$data = array();
$data['detection_pic'] = $detection_pic ?? "";
$data['detection_bar_code'] = $request_params['detection_bar_code'];
$data['detection_status'] = 3;
$params = array();
$params['order_detection_id'] = $order_detection_id;
$res = OrderDetection::editOrderDetection($params,$data);
if (!$res){
Db::rollBack();
return fail(HttpEnumCode::HTTP_ERROR,"绑定失败");
}
// 上报数据
Db::commit();
}catch (\Exception $e){
Db::rollBack();
return fail(HttpEnumCode::HTTP_ERROR, $e->getMessage());
}
return success();