|
@@ -28,6 +28,7 @@ import java.time.LocalDateTime;
|
|
|
import java.time.ZoneId;
|
|
import java.time.ZoneId;
|
|
|
import java.time.format.DateTimeFormatter;
|
|
import java.time.format.DateTimeFormatter;
|
|
|
import java.util.*;
|
|
import java.util.*;
|
|
|
|
|
+import java.util.logging.Logger;
|
|
|
import java.util.stream.Collectors;
|
|
import java.util.stream.Collectors;
|
|
|
|
|
|
|
|
/**
|
|
/**
|
|
@@ -1205,6 +1206,9 @@ public class HouseNumberStateController implements HouseNumberStateAPI {
|
|
|
// 修改订单
|
|
// 修改订单
|
|
|
houseOrder.setHouseNumberId(houseNumberId);
|
|
houseOrder.setHouseNumberId(houseNumberId);
|
|
|
|
|
|
|
|
|
|
+// 换房后,当前时间为入住时间
|
|
|
|
|
+ houseOrder.setLiveTime(date);
|
|
|
|
|
+
|
|
|
// 获取水电消费金额和额度
|
|
// 获取水电消费金额和额度
|
|
|
// 获取初始房间号的水电表设备id
|
|
// 获取初始房间号的水电表设备id
|
|
|
HouseNumber initialHouseNumber = houseNumberService.getById(initialHouseNumberId);
|
|
HouseNumber initialHouseNumber = houseNumberService.getById(initialHouseNumberId);
|
|
@@ -1247,7 +1251,6 @@ public class HouseNumberStateController implements HouseNumberStateAPI {
|
|
|
|
|
|
|
|
houseOrder.setWaterCost(costWater);
|
|
houseOrder.setWaterCost(costWater);
|
|
|
houseOrder.setWaterConsume(consumeWater);
|
|
houseOrder.setWaterConsume(consumeWater);
|
|
|
-
|
|
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
|
|
|