|
@@ -90,6 +90,7 @@ import java.text.SimpleDateFormat;
|
|
|
import java.time.LocalDateTime;
|
|
import java.time.LocalDateTime;
|
|
|
import java.time.LocalTime;
|
|
import java.time.LocalTime;
|
|
|
import java.time.format.DateTimeFormatter;
|
|
import java.time.format.DateTimeFormatter;
|
|
|
|
|
+import java.time.temporal.ChronoUnit;
|
|
|
import java.util.ArrayList;
|
|
import java.util.ArrayList;
|
|
|
import java.util.Calendar;
|
|
import java.util.Calendar;
|
|
|
import java.util.Date;
|
|
import java.util.Date;
|
|
@@ -1548,6 +1549,15 @@ public class AppAppOrderServiceImpl extends ServiceImpl<AppOrderDao, TbOrder> im
|
|
|
return Result.success();
|
|
return Result.success();
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
|
|
+ String reservationFlag = tbOrder.getReservationFlag();
|
|
|
|
|
+ if (StrUtil.equals(reservationFlag, Constant.YES)) {
|
|
|
|
|
+ Date now = new Date();
|
|
|
|
|
+ Date expectDeliveryTime = tbOrder.getExpectDeliveryTime();
|
|
|
|
|
+ if (ChronoUnit.SECONDS.between(now.toInstant(), expectDeliveryTime.toInstant()) > 3600) {
|
|
|
|
|
+ throw new SqxException("预约订单只能在期望送达时间前1小时内进行接单!");
|
|
|
|
|
+ }
|
|
|
|
|
+ }
|
|
|
|
|
+
|
|
|
// 修改订单状态
|
|
// 修改订单状态
|
|
|
order.setStatus(6);
|
|
order.setStatus(6);
|
|
|
//商家接单
|
|
//商家接单
|