From 68f7b97eaa7596be34d221c3f0c5597ec91c9504 Mon Sep 17 00:00:00 2001 From: zhangheng <3226558941@qq.com> Date: Tue, 14 Nov 2023 16:28:01 +0800 Subject: [PATCH] =?UTF-8?q?=E5=B0=8F=E7=A8=8B=E5=BA=8F=E4=B8=93=E5=AE=B6?= =?UTF-8?q?=E5=92=A8=E8=AF=A2=E8=AE=A2=E5=8D=95=E8=AF=84=E4=BB=B7=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/AppOrderEvaluateServiceImpl.java | 15 ++++++++++++++- .../apporderevaluate/AppOrderEvaluateMapper.xml | 3 ++- 2 files changed, 16 insertions(+), 2 deletions(-) diff --git a/xinelu-nurse-applet/src/main/java/com/xinelu/applet/service/apporderevaluate/impl/AppOrderEvaluateServiceImpl.java b/xinelu-nurse-applet/src/main/java/com/xinelu/applet/service/apporderevaluate/impl/AppOrderEvaluateServiceImpl.java index 2d21548..f96b827 100644 --- a/xinelu-nurse-applet/src/main/java/com/xinelu/applet/service/apporderevaluate/impl/AppOrderEvaluateServiceImpl.java +++ b/xinelu-nurse-applet/src/main/java/com/xinelu/applet/service/apporderevaluate/impl/AppOrderEvaluateServiceImpl.java @@ -8,6 +8,7 @@ import com.xinelu.common.core.domain.AjaxResult; import com.xinelu.common.enums.GooodsOrderStatusEnum; import com.xinelu.common.enums.OrderSourceEnum; import com.xinelu.common.enums.OrderStatusEnum; +import com.xinelu.common.enums.OrderTypeEnum; import com.xinelu.common.exception.ServiceException; import com.xinelu.common.utils.bean.BeanUtils; import com.xinelu.common.utils.file.FileUploadUtils; @@ -86,9 +87,20 @@ public class AppOrderEvaluateServiceImpl implements IAppOrderEvaluateService { @Transactional(rollbackFor = Exception.class) @Override public AjaxResult insertGoodsOrderEvaluate(OrderEvaluateAndPictureDTO orderEvaluateAndPictureDTO) { + OrderEvaluateAndPictureDTO orderEvaluate = appOrderEvaluateMapper.selectOrderEvaluateAndPictureByOrderNo(orderEvaluateAndPictureDTO.getOrderNo()); + if (Objects.nonNull(orderEvaluate)) { + return AjaxResult.error("当前订单已评价！"); + } + //泉医模块评价判断 if (OrderSourceEnum.SPRING_DOCTOR.getInfo().equals(orderEvaluateAndPictureDTO.getOrderSource())) { GoodsOrder goodsOrder = appOrderEvaluateMapper.selectGoodsOrderByOrderNo(orderEvaluateAndPictureDTO.getOrderNo()); - if (Objects.isNull(goodsOrder) || StringUtils.isBlank(goodsOrder.getOrderStatus()) || !goodsOrder.getOrderStatus().equals(GooodsOrderStatusEnum.RECEIVED_GOODS.getInfo())) { + if (Objects.isNull(goodsOrder)) { + return AjaxResult.error("当前订单以失效，请选择其他订单信息！"); + } + if (OrderTypeEnum.HEALTH_CONSULTATION.getInfo().equals(goodsOrder.getOrderType()) && (StringUtils.isBlank(goodsOrder.getOrderStatus()) || !goodsOrder.getOrderStatus().equals(GooodsOrderStatusEnum.COMPLETED.getInfo()))) { + return AjaxResult.error("当前订单未确认完成，请医生先确认完成后进行评价！"); + } + if (!OrderTypeEnum.HEALTH_CONSULTATION.getInfo().equals(goodsOrder.getOrderType()) && (StringUtils.isBlank(goodsOrder.getOrderStatus()) || !goodsOrder.getOrderStatus().equals(GooodsOrderStatusEnum.RECEIVED_GOODS.getInfo()))) { return AjaxResult.error("当前订单未确认收货，请先确认收货后进行评价！"); } if (StringUtils.equals(GooodsOrderStatusEnum.EVALUATED.getInfo(), goodsOrder.getOrderStatus())) { @@ -103,6 +115,7 @@ public class AppOrderEvaluateServiceImpl implements IAppOrderEvaluateService { if (insertOrderEvaluateInfo <= 0) { throw new ServiceException("评价失败，请联系管理员！"); } + //家医评价终止 if (OrderSourceEnum.FAMILY_DOCTOR.getInfo().equals(orderEvaluateAndPictureDTO.getOrderSource())) { return AjaxResult.success(); } diff --git a/xinelu-nurse-applet/src/main/resources/mapper/applet/apporderevaluate/AppOrderEvaluateMapper.xml b/xinelu-nurse-applet/src/main/resources/mapper/applet/apporderevaluate/AppOrderEvaluateMapper.xml index 4aa560b..553af18 100644 --- a/xinelu-nurse-applet/src/main/resources/mapper/applet/apporderevaluate/AppOrderEvaluateMapper.xml +++ b/xinelu-nurse-applet/src/main/resources/mapper/applet/apporderevaluate/AppOrderEvaluateMapper.xml @@ -69,7 +69,8 @@