|
@@ -264,10 +264,15 @@ public class XiaoyuanReservatServiceImpl implements IXiaoyuanReservatService {
|
|
return R.fail("无当前学校预约,核销失败");
|
|
return R.fail("无当前学校预约,核销失败");
|
|
}
|
|
}
|
|
int i = 0;
|
|
int i = 0;
|
|
|
|
+ //获取当前时间
|
|
|
|
+ String date = DateUtils.getDate();
|
|
for (XiaoyuanReservatVo xiaoyuanReservatVo : reservatVoList) {
|
|
for (XiaoyuanReservatVo xiaoyuanReservatVo : reservatVoList) {
|
|
if("2".equals(xiaoyuanReservatVo.getVisitStatus())){
|
|
if("2".equals(xiaoyuanReservatVo.getVisitStatus())){
|
|
return R.ok("核销失败");
|
|
return R.ok("核销失败");
|
|
}
|
|
}
|
|
|
|
+ if(!date.equals(xiaoyuanReservatVo.getVisitDate())){
|
|
|
|
+ return R.fail("请核对预约时间,核销失败");
|
|
|
|
+ }
|
|
XiaoyuanReservat update = new XiaoyuanReservat();
|
|
XiaoyuanReservat update = new XiaoyuanReservat();
|
|
update.setReservatId(xiaoyuanReservatVo.getReservatId());
|
|
update.setReservatId(xiaoyuanReservatVo.getReservatId());
|
|
update.setVisitStatus("2");
|
|
update.setVisitStatus("2");
|