mozhe
/
mental-tenant-api
5
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

预约处理优化

This commit is contained in:
cjw 2024-09-23 16:23:59 +08:00
parent 38c3cde726
commit 512f40e3bd
4 changed files with 17 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/controller/wx/WxCounselorController.java
View File

@ -232,7 +232,7 @@ public class WxCounselorController extends BaseController {
@Log(title = "新增干预记录", businessType = BusinessType.INSERT) @Log(title = "新增干预记录", businessType = BusinessType.INSERT)
@RepeatSubmit() @RepeatSubmit()
@PostMapping("/intervene") @PostMapping("/intervene")
public R<Void> add(@Validated(AddGroup.class) @RequestBody SysInterveneRecordBo bo) { public R<Void> add(@RequestBody SysInterveneRecordBo bo) {
return toAjax(reservationService.insertIntervene(bo)); return toAjax(reservationService.insertIntervene(bo));
} }
} }

8
ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/service/impl/ReservationServiceImpl.java
View File

@ -125,12 +125,16 @@ public class ReservationServiceImpl implements IReservationService {
@Override @Override
public Boolean insertIntervene(SysInterveneRecordBo bo) { 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(); ReservationOrder orderUpdate = new ReservationOrder();
orderUpdate.setDiagnose(bo.getDiagnose()); orderUpdate.setDiagnose(bo.getDiagnose());
orderUpdate.setAnnex(bo.getDiagnoseAnnex()); orderUpdate.setAnnex(bo.getDiagnoseAnnex());
orderUpdate.setOrderStatus(2); orderUpdate.setOrderStatus(2);
orderUpdate.setId(bo.getBatchNo()); orderUpdate.setId(orderId);
boolean orderFlag = reservationOrderMapper.updateById(orderUpdate) > 0; boolean orderFlag = reservationOrderMapper.updateById(orderUpdate) > 0;
ReservationTime timeUpdate = new ReservationTime(); ReservationTime timeUpdate = new ReservationTime();
timeUpdate.setId(bo.getInterveneId()); timeUpdate.setId(bo.getInterveneId());

5
ruoyi-modules/rouyi-scale/src/main/resources/mapper/scale/ReservationDayMapper.xml
View File

@ -38,8 +38,9 @@
left join m_reservation_day rd on rd.id = rt.day_id 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 m_reservation_order ro on ro.time_id = rt.id
left join sys_user u on u.user_id = ro.create_by left join sys_user u on u.user_id = ro.create_by
where rt.counselor_id = #{userId} where DATE_FORMAT(rd.day_time, '%Y-%m-%d') = #{time}
and DATE_FORMAT(rd.day_time, '%Y-%m-%d') = #{time} and rt.counselor_id = #{userId}
and ro.order_status = 1
and rt.`status` > 0 and rt.`status` > 0
</select> </select>
</mapper> </mapper>

1
ruoyi-modules/rouyi-scale/src/main/resources/mapper/scale/ReservationTimeMapper.xml
View File

@ -18,5 +18,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
where rt.counselor_id = #{counselorId} where rt.counselor_id = #{counselorId}
and rt.`status` = 1 and rt.`status` = 1
and ro.order_status = 1 and ro.order_status = 1
order by rt.start_time
</select> </select>
</mapper> </mapper>