Commit 50e1b207 by huluobin

闲时折扣

parent 783f2ad8
...@@ -926,7 +926,7 @@ public class ScheduleManageServiceImpl extends ServiceImpl<ScheduleManageMapper, ...@@ -926,7 +926,7 @@ public class ScheduleManageServiceImpl extends ServiceImpl<ScheduleManageMapper,
} else { } else {
oldScheduleServeList = Lists.newArrayList(); oldScheduleServeList = Lists.newArrayList();
} }
String date = new SimpleDateFormat("yyyy-MM-dd").format(scheduleManage.getScheduledTime()); String date = new SimpleDateFormat("yyyy-MM-dd").format(scheduleManage.getScheduledTime() != null ? scheduleManage.getScheduledTime() : scheduleManage.getArriveTime());
oldScheduleServeList.forEach(scheduleServe -> { oldScheduleServeList.forEach(scheduleServe -> {
if (scheduleServe.getLeisureDiscountConfigId() != null) { if (scheduleServe.getLeisureDiscountConfigId() != null) {
LeisureDiscountConfigLimit leisureDiscountConfigLimit = leisureDiscountConfigLimitMapper.selectConfigLimit(date, scheduleServe.getLeisureDiscountConfigId()); LeisureDiscountConfigLimit leisureDiscountConfigLimit = leisureDiscountConfigLimitMapper.selectConfigLimit(date, scheduleServe.getLeisureDiscountConfigId());
......
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