Commit 1a89d35d by 吕明尚

在保洁中续单由原来的删除保洁任务变更为修改保洁

parent b0c44123
......@@ -879,7 +879,10 @@ public class SOrderServiceImpl extends ServiceImpl<SOrderMapper, SOrder> impleme
.eq(SCleanRecords::getRoomId, sOrder.getRoomId())
.ne(SCleanRecords::getStatus, CleaningStatusEnum.CLEANED.getCode()));
if (ObjectUtil.isNotEmpty(sCleanRecords)) {
isCleanRecordsService.removeById(sCleanRecords.getId());
sCleanRecords.setStartDate(new Date());
sCleanRecords.setEndDate(new Date());
sCleanRecords.setStatus(CleaningStatusEnum.CLEANED.getCode());
isCleanRecordsService.updateById(sCleanRecords);
}
wechatNewService.sendMiniSubscribeMessage(sOrder, MessageReminderEnum.RESERVER);
if (response.getStatus().equals(YesNoEnum.yes.getFlag())) {
......@@ -1342,7 +1345,10 @@ public class SOrderServiceImpl extends ServiceImpl<SOrderMapper, SOrder> impleme
.ne(SCleanRecords::getStatus, CleaningStatusEnum.CLEANED.getCode())
);
if (ObjectUtil.isNotEmpty(sCleanRecords)) {
isCleanRecordsService.removeById(sCleanRecords.getId());
sCleanRecords.setStartDate(new Date());
sCleanRecords.setEndDate(new Date());
sCleanRecords.setStatus(CleaningStatusEnum.CLEANED.getCode());
isCleanRecordsService.updateById(sCleanRecords);
}
wechatNewService.sendMiniSubscribeMessage(sOrder, MessageReminderEnum.RESERVER);
sOrder.setStartDate(sOrder.getPreStartDate());
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment