|
|
@@ -3406,7 +3406,6 @@ public class HouseOrderController implements HouseOrderAPI {
|
|
|
LocalDate end = endTime.toLocalDate();
|
|
|
|
|
|
|
|
|
-
|
|
|
// 获取预定时间的开始星期和结束星期
|
|
|
String chineseDayOfWeek = state.getDayOfWeek().getDisplayName(TextStyle.FULL, Locale.CHINA);
|
|
|
Integer week = 0;
|
|
|
@@ -3432,11 +3431,11 @@ public class HouseOrderController implements HouseOrderAPI {
|
|
|
String endTimeXq = localEnd.format(dateTimeFormatter2);
|
|
|
// 查询该星期是否满足有2天的订单
|
|
|
LambdaQueryWrapper<HouseOrder> wrapperHO = new LambdaQueryWrapper<>();
|
|
|
- wrapperHO.between(HouseOrder::getReserveLiveTime, stateTimeXq, endTimeXq)
|
|
|
+ wrapperHO.between(HouseOrder::getReserveLiveTime, stateTimeXq+" 00:00:00", endTimeXq+" 23:59:59")
|
|
|
.eq(HouseOrder::getReserveUserId, userId)
|
|
|
.eq(HouseOrder::getSource, 1)
|
|
|
.eq(HouseOrder::getPayPrice, 0)
|
|
|
- .in(HouseOrder::getOrderStatus, "1,2,3,4,8");
|
|
|
+ .in(HouseOrder::getOrderStatus, 1,2,3,4,8);
|
|
|
List<HouseOrder> orderList = houseOrderService.list(wrapperHO);
|
|
|
|
|
|
long dayDiff = 0;
|
|
|
@@ -3503,7 +3502,7 @@ public class HouseOrderController implements HouseOrderAPI {
|
|
|
.eq(HouseOrder::getSource,2)
|
|
|
.between(HouseOrder::getReserveLiveTime,startTime,endTime1)
|
|
|
.eq(HouseOrder::getPayPrice, 0)
|
|
|
- .in(HouseOrder::getOrderStatus, "1,2,3,4,8");
|
|
|
+ .in(HouseOrder::getOrderStatus, 1,2,3,4,8);
|
|
|
List<HouseOrder> list = houseOrderService.list(wrapper);
|
|
|
Integer count2 = Integer.valueOf(houseCount);
|
|
|
count2=count2-list.size();
|