Merge branch 'dev-new' into dev-new-rabbitmq

This commit is contained in:
Guoqs
2024-11-06 14:08:52 +08:00
17 changed files with 411 additions and 12 deletions

View File

@@ -464,10 +464,12 @@ public class PileService {
if (StringUtils.equals(Constants.ONE, type)) {
List<PileMemberRelation> pileMemberRelations = pileMemberRelationService.selectPileMemberRelationByPileSn(dto.getPileSn());
idList = pileMemberRelations.stream().map(PileMemberRelation::getId).collect(Collectors.toList());
// 管理员解绑,需要删除该桩的预约信息
pileReservationInfoService.deleteReservationByPileSn(dto.getPileSn());
}else {
idList.add(pileMemberRelation.getId());
}
return pileMemberRelationService.deleteRelationByIds(idList);
}