ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/OrderServiceImpl.java
@@ -209,6 +209,13 @@ orderDetailVO.setShopId(shop.getId()); orderDetailVO.setTechnicianName(technician.getName()); orderDetailVO.setTechnicianId(technician.getId()); if(order.getOrderType() == 1){ List<TechnicianSubscribe> data = technicianSubscribeClient.getTechnicianSubscribeList(order.getId()).getData(); if(data.size() > 0){ Long id = data.get(0).getId(); orderDetailVO.setTechnicianSubscribeId(id.toString()); } } return orderDetailVO; } ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/service/impl/TechnicianSubscribeServiceImpl.java
@@ -98,7 +98,9 @@ @Override public void switchingTechnician(TechnicianSubscribe technicianSubscribe) { TechnicianSubscribe subscribe = this.getById(technicianSubscribe.getId()); List<TechnicianSubscribe> list = this.list(new LambdaQueryWrapper<TechnicianSubscribe>().eq(TechnicianSubscribe::getOrderId, technicianSubscribe.getOrderId()) .eq(TechnicianSubscribe::getDelFlag, 0).eq(TechnicianSubscribe::getStatus, 0)); for (TechnicianSubscribe subscribe : list) { if(subscribe.getTechnicianId().equals(technicianSubscribe.getTechnicianId())){ throw new RuntimeException("不能切换相同的技师"); } @@ -106,6 +108,8 @@ this.updateById(subscribe); } } /** * 定时修改到期状态 */