diff --git a/mall-shop/src/main/java/com/suisung/mall/shop/order/service/impl/ShopOrderInfoServiceImpl.java b/mall-shop/src/main/java/com/suisung/mall/shop/order/service/impl/ShopOrderInfoServiceImpl.java index fe5b78be..13812b61 100644 --- a/mall-shop/src/main/java/com/suisung/mall/shop/order/service/impl/ShopOrderInfoServiceImpl.java +++ b/mall-shop/src/main/java/com/suisung/mall/shop/order/service/impl/ShopOrderInfoServiceImpl.java @@ -1128,64 +1128,61 @@ public class ShopOrderInfoServiceImpl extends BaseServiceImpl 0 && "立即送出".equals(items.get(0).getTime_title()))) { - BookingArgDTO.BookingArgItem timeItem = new BookingArgDTO.BookingArgItem(); - String beginTimeStr = DateUtil.format(currentTimeSlot, "HH:mm"); - String endTimeStr = DateUtil.format(endTimeSlot, "HH:mm"); + // 创建时间段项 + BookingArgDTO.BookingArgItem timeItem = new BookingArgDTO.BookingArgItem(); + String beginTimeStr = DateUtil.format(currentTimeSlot, "HH:mm"); + String endTimeStr = DateUtil.format(endTimeSlot, "HH:mm"); - timeItem.setTime_title(beginTimeStr + "-" + endTimeStr); + timeItem.setTime_title(beginTimeStr + "-" + endTimeStr); - // 修正时间戳计算 - long bookingAt = currentTimeSlot.getTime() / 1000; - timeItem.setBooking_at(bookingAt); + // 时间戳计算(秒) + long bookingAt = currentTimeSlot.getTime() / 1000; + timeItem.setBooking_at(bookingAt); - timeItem.setBooking_state(2); - timeItem.setBooking_begin_time(DateUtil.format(currentTimeSlot, "yyyy-MM-dd HH:mm:ss")); - timeItem.setBooking_end_time(DateUtil.format(DateUtil.offsetMinute(currentTimeSlot, 40), "yyyy-MM-dd HH:mm:ss")); + timeItem.setBooking_state(2); + timeItem.setBooking_begin_time(DateUtil.format(currentTimeSlot, "yyyy-MM-dd HH:mm:ss")); + timeItem.setBooking_end_time(DateUtil.format(endTimeSlot, "yyyy-MM-dd HH:mm:ss")); - items.add(timeItem); - } + items.add(timeItem); // 移动到下一个时间段 currentTimeSlot = endTimeSlot;