|
|
@@ -57,7 +57,6 @@ import javax.servlet.http.HttpServletRequest;
|
|
|
import javax.servlet.http.HttpServletResponse;
|
|
|
import java.math.BigDecimal;
|
|
|
import java.security.Signature;
|
|
|
-import java.sql.Time;
|
|
|
import java.text.SimpleDateFormat;
|
|
|
import java.time.LocalDateTime;
|
|
|
import java.time.ZoneId;
|
|
|
@@ -495,7 +494,11 @@ public class HouseOrderController implements HouseOrderAPI {
|
|
|
String cardNumber = users.getCardNumber();
|
|
|
ArrayList<String> strings = new ArrayList<>();
|
|
|
strings.add(cardNumber);
|
|
|
- weiXiaoComponent.sendNotice(strings, "公寓办理入住成功", "办理入住成功", "您的房间号为:" + roomNumber + ",密码是:" + passWord + "离店时间为:" + reserveLeaveTime + ",欢迎您入住张玉玲酒店，我们全体员工很荣幸能为您服务，如有任何需要请致电张玉玲，期待为你服务。祝你生活愉快！", null);
|
|
|
+ // 获取手机号
|
|
|
+ List<ApartmentSetting> list = apartmentSettingService.list(new LambdaQueryWrapper<>());
|
|
|
+ ApartmentSetting apartmentSetting = list.get(0);
|
|
|
+ String phoneNumber = apartmentSetting.getPhoneNumbr();
|
|
|
+ weiXiaoComponent.sendNotice(strings, "公寓办理入住成功", "办理入住成功", "您的房间号为:" + roomNumber + ",密码是:" + passWord + "离店时间为:" + reserveLeaveTime + ",欢迎您入住研究生公寓，我们全体员工很荣幸能为您服务，如有任何需要请致电:"+phoneNumber+"，期待为你服务。祝你生活愉快！", null);
|
|
|
// 添加锁的操作记录
|
|
|
OperatingRecord operatingRecord = new OperatingRecord();
|
|
|
operatingRecord.setRoomNumber(houseNumber.getRoomNumber());
|
|
|
@@ -2209,7 +2212,7 @@ public class HouseOrderController implements HouseOrderAPI {
|
|
|
// boolean effectiveDate = DateUtil.isEffectiveDate(new Date(), liveTime, endTime);
|
|
|
// if (!effectiveDate) {
|
|
|
HouseNumberState houseNumberStateData = houseNumberStateService.getData(new Date(), houseNumberId);
|
|
|
- if (ObjectUtils.isNotEmpty(houseNumberStateData)) {
|
|
|
+ if (ObjectUtils.isEmpty(houseNumberStateData)) {
|
|
|
houseOrder.setLeaveTime(Date.from(LocalDateTime.parse(reserveLeaveTime, dateTimeFormatter).atZone(ZoneId.systemDefault()).toInstant()));
|
|
|
houseOrderService.updateById(houseOrder);
|
|
|
return CommonResult.ok("该时间段已超过退房时间，已修改其订单状态");
|
