From 9a66d3a382406eda71b09ed06ddb5d4a0dc95989 Mon Sep 17 00:00:00 2001 From: liukangdong <898885815@qq.com> Date: 星期一, 24 二月 2025 16:38:22 +0800 Subject: [PATCH] Merge branch 'master' of http://139.186.142.91:10010/r/productDev/dmvisit --- server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/VisitsServiceImpl.java | 11 +++++++---- 1 files changed, 7 insertions(+), 4 deletions(-) diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/VisitsServiceImpl.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/VisitsServiceImpl.java index 3ea7c15..d4a6aa1 100644 --- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/VisitsServiceImpl.java +++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/VisitsServiceImpl.java @@ -13,6 +13,7 @@ import com.doumee.core.exception.BusinessException; import com.doumee.core.haikang.model.HKConstants; import com.doumee.core.haikang.model.param.BaseResponse; +import com.doumee.core.haikang.model.param.request.VisitAppointmentCancelRequest; import com.doumee.core.haikang.model.param.request.VisitAppointmentOutRequest; import com.doumee.core.haikang.model.param.request.VisitAppointmentRequest; import com.doumee.core.haikang.model.param.respose.VisitAppointmentResponse; @@ -1505,7 +1506,8 @@ VisitAppointmentOutRequest request = new VisitAppointmentOutRequest(); request.setOrderId(visits.getHkId()); //璋冪敤娴峰悍寮哄埗绛剧 - BaseResponse response = HKService.outVisitAppiontment(request); + BaseResponse response = HKService.iccmSignoff(request); +// BaseResponse response = HKService.outVisitAppiontment(request); visitsMapper.update(null,new UpdateWrapper<Visits>().lambda().set(Visits::getStatus,Constants.VisitStatus.signout) .eq(Visits::getId,visitId)); //浜у嚭鍦ㄥ満浜哄憳淇℃伅 @@ -1522,10 +1524,11 @@ if(!visits.getStatus().equals(Constants.VisitStatus.xfSuccess)){ throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"璁垮璁板綍鐘舵�侀敊璇紝璇峰埛鏂伴噸璇�"); } - VisitAppointmentOutRequest request = new VisitAppointmentOutRequest(); - request.setOrderId(visits.getHkId()); + VisitAppointmentCancelRequest request = new VisitAppointmentCancelRequest(); + request.setAppointRecordIds(new String[]{visits.getHkId()}); //璋冪敤娴峰悍寮哄埗绛剧 - BaseResponse response = HKService.outVisitAppiontment(request); +// BaseResponse response = HKService.outVisitAppiontment(request); + BaseResponse response = HKService.iccmCancelAppointment(request); visitsMapper.update(null,new UpdateWrapper<Visits>().lambda().set(Visits::getStatus,Constants.VisitStatus.signout) .eq(Visits::getId,visitId)); //浜у嚭鍦ㄥ満浜哄憳淇℃伅 -- Gitblit v1.9.3