diff --git a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/controller/wx/WxCounselorController.java b/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/controller/wx/WxCounselorController.java index e38e279..0a17e20 100644 --- a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/controller/wx/WxCounselorController.java +++ b/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/controller/wx/WxCounselorController.java @@ -232,7 +232,7 @@ public class WxCounselorController extends BaseController { @Log(title = "新增干预记录", businessType = BusinessType.INSERT) @RepeatSubmit() @PostMapping("/intervene") - public R add(@Validated(AddGroup.class) @RequestBody SysInterveneRecordBo bo) { + public R add(@RequestBody SysInterveneRecordBo bo) { return toAjax(reservationService.insertIntervene(bo)); } } diff --git a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/service/impl/ReservationServiceImpl.java b/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/service/impl/ReservationServiceImpl.java index 49f9b3a..7676de6 100644 --- a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/service/impl/ReservationServiceImpl.java +++ b/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/service/impl/ReservationServiceImpl.java @@ -125,12 +125,16 @@ public class ReservationServiceImpl implements IReservationService { @Override public Boolean insertIntervene(SysInterveneRecordBo bo) { - //todo 订单状态校验 + Long orderId = bo.getBatchNo(); + ReservationOrder reservationOrder = reservationOrderMapper.selectById(orderId); + if (reservationOrder == null || reservationOrder.getOrderStatus() !=1) { + throw new ServiceException("订单状态异常,请确认后再提交"); + } ReservationOrder orderUpdate = new ReservationOrder(); orderUpdate.setDiagnose(bo.getDiagnose()); orderUpdate.setAnnex(bo.getDiagnoseAnnex()); orderUpdate.setOrderStatus(2); - orderUpdate.setId(bo.getBatchNo()); + orderUpdate.setId(orderId); boolean orderFlag = reservationOrderMapper.updateById(orderUpdate) > 0; ReservationTime timeUpdate = new ReservationTime(); timeUpdate.setId(bo.getInterveneId()); diff --git a/ruoyi-modules/rouyi-scale/src/main/resources/mapper/scale/ReservationDayMapper.xml b/ruoyi-modules/rouyi-scale/src/main/resources/mapper/scale/ReservationDayMapper.xml index 4f67846..4c5edd7 100644 --- a/ruoyi-modules/rouyi-scale/src/main/resources/mapper/scale/ReservationDayMapper.xml +++ b/ruoyi-modules/rouyi-scale/src/main/resources/mapper/scale/ReservationDayMapper.xml @@ -38,8 +38,9 @@ left join m_reservation_day rd on rd.id = rt.day_id left join m_reservation_order ro on ro.time_id = rt.id left join sys_user u on u.user_id = ro.create_by - where rt.counselor_id = #{userId} - and DATE_FORMAT(rd.day_time, '%Y-%m-%d') = #{time} + where DATE_FORMAT(rd.day_time, '%Y-%m-%d') = #{time} + and rt.counselor_id = #{userId} + and ro.order_status = 1 and rt.`status` > 0 diff --git a/ruoyi-modules/rouyi-scale/src/main/resources/mapper/scale/ReservationTimeMapper.xml b/ruoyi-modules/rouyi-scale/src/main/resources/mapper/scale/ReservationTimeMapper.xml index 6606786..c290d40 100644 --- a/ruoyi-modules/rouyi-scale/src/main/resources/mapper/scale/ReservationTimeMapper.xml +++ b/ruoyi-modules/rouyi-scale/src/main/resources/mapper/scale/ReservationTimeMapper.xml @@ -5,12 +5,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"