|
|
@@ -1219,250 +1219,272 @@ public class HouseNumberStateController implements HouseNumberStateAPI {
|
|
|
wrapperHo.eq(HouseOrder::getOrderNumber, orderNumber);
|
|
|
|
|
|
HouseOrder houseOrder = houseOrderService.getOne(wrapperHo);
|
|
|
- if (ObjectUtils.isEmpty(houseOrder)) {
|
|
|
- return CommonResult.fail("无该订单");
|
|
|
- }
|
|
|
- Date liveTime = houseOrder.getLiveTime();
|
|
|
+
|
|
|
+ String orderStatus = houseOrder.getOrderStatus();
|
|
|
+ if ("3".equals(orderStatus)) {
|
|
|
+
|
|
|
+ String reserveLiveTime = houseOrder.getReserveLiveTime();
|
|
|
+ String reserveLeaveTime = houseOrder.getReserveLeaveTime();
|
|
|
+
|
|
|
+ // 判断该房间在该订单的时间内是否有使用
|
|
|
+ List<HouseNumberState> houseNumberStateList = houseNumberStateService.beBooked(houseNumberId, reserveLiveTime, reserveLeaveTime);
|
|
|
+
|
|
|
+ if (ObjectUtils.isNotEmpty(houseNumberStateList) && houseNumberStateList.size() > 0) {
|
|
|
+ return CommonResult.fail("此时间段内，该房间已被使用");
|
|
|
+ }
|
|
|
+
|
|
|
+// 修改订单
|
|
|
+ houseOrder.setHouseNumberId(houseNumberId);
|
|
|
+
|
|
|
+ houseOrderService.updateById(houseOrder);
|
|
|
+
|
|
|
+ return CommonResult.ok();
|
|
|
+ }else {
|
|
|
+
|
|
|
+
|
|
|
+ Date liveTime = houseOrder.getLiveTime();
|
|
|
+
|
|
|
|
|
|
// 判断当前时间到预离店时间是否有房间
|
|
|
- Date date = new Date();
|
|
|
- SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
|
|
|
- String format = sdf.format(liveTime);
|
|
|
- String format1 = sdf.format(date);
|
|
|
- // 判断该房间在该订单的时间内是否有使用
|
|
|
- List<HouseNumberState> houseNumberStateList = houseNumberStateService.beBooked(houseNumberId, format1, houseOrder.getReserveLeaveTime());
|
|
|
+ Date date = new Date();
|
|
|
+ SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
|
|
|
+ String format = sdf.format(liveTime);
|
|
|
+ String format1 = sdf.format(date);
|
|
|
+ // 判断该房间在该订单的时间内是否有使用
|
|
|
+ List<HouseNumberState> houseNumberStateList = houseNumberStateService.beBooked(houseNumberId, format1, houseOrder.getReserveLeaveTime());
|
|
|
|
|
|
- if (ObjectUtils.isNotEmpty(houseNumberStateList) && houseNumberStateList.size() > 0) {
|
|
|
- return CommonResult.fail("此时间段内，该房间已被使用");
|
|
|
- }
|
|
|
+ if (ObjectUtils.isNotEmpty(houseNumberStateList) && houseNumberStateList.size() > 0) {
|
|
|
+ return CommonResult.fail("此时间段内，该房间已被使用");
|
|
|
+ }
|
|
|
|
|
|
// 修改订单
|
|
|
- houseOrder.setHouseNumberId(houseNumberId);
|
|
|
+ houseOrder.setHouseNumberId(houseNumberId);
|
|
|
|
|
|
// 换房后，当前时间为入住时间
|
|
|
- houseOrder.setLiveTime(date);
|
|
|
+ houseOrder.setLiveTime(date);
|
|
|
|
|
|
- // 获取水电消费金额和额度
|
|
|
+ // 获取水电消费金额和额度
|
|
|
// 获取初始房间号的水电表设备id
|
|
|
- HouseNumber initialHouseNumber = houseNumberService.getById(initialHouseNumberId);
|
|
|
- String electricEquipmentId = initialHouseNumber.getElectricEquipmentId();
|
|
|
- String waterEquipmentId = initialHouseNumber.getWaterEquipmentId();
|
|
|
- ElectricEquipment electricEquipment = electricEquipmentService.getById(electricEquipmentId);
|
|
|
- WaterEquipment waterEquipment = waterEquipmentService.getById(waterEquipmentId);
|
|
|
- if (ObjectUtils.isNotEmpty(electricEquipment) && ObjectUtils.isNotEmpty(waterEquipment)) {
|
|
|
- String electricEquipmentRoomId = electricEquipment.getRoomId();
|
|
|
- String waterEquipmentRoomId = waterEquipment.getRoomId();
|
|
|
+ HouseNumber initialHouseNumber = houseNumberService.getById(initialHouseNumberId);
|
|
|
+ String electricEquipmentId = initialHouseNumber.getElectricEquipmentId();
|
|
|
+ String waterEquipmentId = initialHouseNumber.getWaterEquipmentId();
|
|
|
+ ElectricEquipment electricEquipment = electricEquipmentService.getById(electricEquipmentId);
|
|
|
+ WaterEquipment waterEquipment = waterEquipmentService.getById(waterEquipmentId);
|
|
|
+ if (ObjectUtils.isNotEmpty(electricEquipment) && ObjectUtils.isNotEmpty(waterEquipment)) {
|
|
|
+ String electricEquipmentRoomId = electricEquipment.getRoomId();
|
|
|
+ String waterEquipmentRoomId = waterEquipment.getRoomId();
|
|
|
|
|
|
- String live = sdf.format(liveTime);
|
|
|
- String leave = sdf.format(new Date());
|
|
|
+ String live = sdf.format(liveTime);
|
|
|
+ String leave = sdf.format(new Date());
|
|
|
// 获取电的消费金额和额度
|
|
|
- HouseOrderBill houseOrderBill = new HouseOrderBill();
|
|
|
- JSONObject jsonObjectElectric = electricEquipmentService.roomCostRecord(electricEquipmentRoomId, live, leave);
|
|
|
- BigDecimal costElectric = jsonObjectElectric.getBigDecimal("cost");
|
|
|
- BigDecimal consumeElectric = jsonObjectElectric.getBigDecimal("consume");
|
|
|
- houseOrderBill.setElectricCost(costElectric);
|
|
|
- houseOrderBill.setElectricConsume(consumeElectric);
|
|
|
+ HouseOrderBill houseOrderBill = new HouseOrderBill();
|
|
|
+ JSONObject jsonObjectElectric = electricEquipmentService.roomCostRecord(electricEquipmentRoomId, live, leave);
|
|
|
+ BigDecimal costElectric = jsonObjectElectric.getBigDecimal("cost");
|
|
|
+ BigDecimal consumeElectric = jsonObjectElectric.getBigDecimal("consume");
|
|
|
+ houseOrderBill.setElectricCost(costElectric);
|
|
|
+ houseOrderBill.setElectricConsume(consumeElectric);
|
|
|
|
|
|
|
|
|
- BigDecimal electricCost = houseOrder.getElectricCost();
|
|
|
- if (ObjectUtils.isNotEmpty(electricCost)) {
|
|
|
- costElectric = costElectric.add(electricCost);
|
|
|
- }
|
|
|
- BigDecimal electricConsume = houseOrder.getElectricConsume();
|
|
|
+ BigDecimal electricCost = houseOrder.getElectricCost();
|
|
|
+ if (ObjectUtils.isNotEmpty(electricCost)) {
|
|
|
+ costElectric = costElectric.add(electricCost);
|
|
|
+ }
|
|
|
+ BigDecimal electricConsume = houseOrder.getElectricConsume();
|
|
|
|
|
|
- if (ObjectUtils.isNotEmpty(electricConsume)) {
|
|
|
- consumeElectric = consumeElectric.add(electricConsume);
|
|
|
- }
|
|
|
- houseOrder.setElectricCost(costElectric);
|
|
|
- houseOrder.setElectricConsume(consumeElectric);
|
|
|
+ if (ObjectUtils.isNotEmpty(electricConsume)) {
|
|
|
+ consumeElectric = consumeElectric.add(electricConsume);
|
|
|
+ }
|
|
|
+ houseOrder.setElectricCost(costElectric);
|
|
|
+ houseOrder.setElectricConsume(consumeElectric);
|
|
|
// 获取水的消费金额和额度
|
|
|
- JSONObject jsonObjectWater = waterEquipmentService.roomCostRecord(waterEquipmentRoomId, live, leave);
|
|
|
- BigDecimal costWater = jsonObjectWater.getBigDecimal("cost");
|
|
|
- BigDecimal consumeWater = jsonObjectWater.getBigDecimal("consume");
|
|
|
- houseOrderBill.setWaterCost(costWater);
|
|
|
- houseOrderBill.setWaterConsume(consumeWater);
|
|
|
+ JSONObject jsonObjectWater = waterEquipmentService.roomCostRecord(waterEquipmentRoomId, live, leave);
|
|
|
+ BigDecimal costWater = jsonObjectWater.getBigDecimal("cost");
|
|
|
+ BigDecimal consumeWater = jsonObjectWater.getBigDecimal("consume");
|
|
|
+ houseOrderBill.setWaterCost(costWater);
|
|
|
+ houseOrderBill.setWaterConsume(consumeWater);
|
|
|
|
|
|
|
|
|
- BigDecimal waterCost = houseOrder.getWaterCost();
|
|
|
- if (ObjectUtils.isNotEmpty(waterCost)) {
|
|
|
- costWater = costWater.add(waterCost);
|
|
|
- }
|
|
|
- BigDecimal waterConsume = houseOrder.getWaterConsume();
|
|
|
- if (ObjectUtils.isNotEmpty(waterConsume)) {
|
|
|
- consumeWater = consumeWater.add(waterConsume);
|
|
|
- }
|
|
|
+ BigDecimal waterCost = houseOrder.getWaterCost();
|
|
|
+ if (ObjectUtils.isNotEmpty(waterCost)) {
|
|
|
+ costWater = costWater.add(waterCost);
|
|
|
+ }
|
|
|
+ BigDecimal waterConsume = houseOrder.getWaterConsume();
|
|
|
+ if (ObjectUtils.isNotEmpty(waterConsume)) {
|
|
|
+ consumeWater = consumeWater.add(waterConsume);
|
|
|
+ }
|
|
|
|
|
|
- houseOrder.setWaterCost(costWater);
|
|
|
- houseOrder.setWaterConsume(consumeWater);
|
|
|
+ houseOrder.setWaterCost(costWater);
|
|
|
+ houseOrder.setWaterConsume(consumeWater);
|
|
|
|
|
|
|
|
|
- houseOrderBill.setHouseOrderId(houseOrder.getId());
|
|
|
- houseOrderBill.setHouseNumberId(initialHouseNumberId);
|
|
|
- houseOrderBill.setLiveTime(liveTime);
|
|
|
- houseOrderBill.setLeaveTime(date);
|
|
|
- houseOrderBillService.save(houseOrderBill);
|
|
|
+ houseOrderBill.setHouseOrderId(houseOrder.getId());
|
|
|
+ houseOrderBill.setHouseNumberId(initialHouseNumberId);
|
|
|
+ houseOrderBill.setLiveTime(liveTime);
|
|
|
+ houseOrderBill.setLeaveTime(date);
|
|
|
+ houseOrderBillService.save(houseOrderBill);
|
|
|
|
|
|
- }
|
|
|
+ }
|
|
|
|
|
|
|
|
|
- houseOrderService.updateById(houseOrder);
|
|
|
+ houseOrderService.updateById(houseOrder);
|
|
|
|
|
|
|
|
|
// 添加状态表，修改状态表
|
|
|
- HouseNumberState houseNumberState = new HouseNumberState();
|
|
|
- houseNumberState.setStatus(4);
|
|
|
- houseNumberState.setHouseNumberId(houseNumberId);
|
|
|
- houseNumberState.setStartTime(format);
|
|
|
- houseNumberState.setEndTime(houseOrder.getReserveLeaveTime());
|
|
|
- houseNumberState.setOrderNumber(orderNumber);
|
|
|
- houseNumberStateService.save(houseNumberState);
|
|
|
+ HouseNumberState houseNumberState = new HouseNumberState();
|
|
|
+ houseNumberState.setStatus(4);
|
|
|
+ houseNumberState.setHouseNumberId(houseNumberId);
|
|
|
+ houseNumberState.setStartTime(format);
|
|
|
+ houseNumberState.setEndTime(houseOrder.getReserveLeaveTime());
|
|
|
+ houseNumberState.setOrderNumber(orderNumber);
|
|
|
+ houseNumberStateService.save(houseNumberState);
|
|
|
|
|
|
// 找到订单之前的房态，并修改
|
|
|
- LambdaQueryWrapper<HouseNumberState> wrapperHns = new LambdaQueryWrapper<>();
|
|
|
- wrapperHns.eq(HouseNumberState::getOrderNumber, orderNumber)
|
|
|
- .eq(HouseNumberState::getHouseNumberId, initialHouseNumberId);
|
|
|
- HouseNumberState one = houseNumberStateService.getOne(wrapperHns);
|
|
|
- one.setEndTime(sdf.format(new Date()));
|
|
|
+ LambdaQueryWrapper<HouseNumberState> wrapperHns = new LambdaQueryWrapper<>();
|
|
|
+ wrapperHns.eq(HouseNumberState::getOrderNumber, orderNumber)
|
|
|
+ .eq(HouseNumberState::getHouseNumberId, initialHouseNumberId);
|
|
|
+ HouseNumberState one = houseNumberStateService.getOne(wrapperHns);
|
|
|
+ one.setEndTime(sdf.format(new Date()));
|
|
|
|
|
|
// houseNumberStateService.updateById(one);
|
|
|
- houseNumberStateService.removeById(one.getId());
|
|
|
+ houseNumberStateService.removeById(one.getId());
|
|
|
|
|
|
// 修改换的房间
|
|
|
- HouseNumber houseNumber = houseNumberService.getById(houseNumberId);
|
|
|
+ HouseNumber houseNumber = houseNumberService.getById(houseNumberId);
|
|
|
// 房间置脏需退房后
|
|
|
// houseNumber.setHouseStatus(2);
|
|
|
// 开电
|
|
|
// Boolean aBoolean = electricEquipmentService.openMeterControl(houseNumber.getElectricEquipmentId());
|
|
|
- String msg = "";
|
|
|
+ String msg = "";
|
|
|
// if (!aBoolean) {
|
|
|
// msg = "开电失败";
|
|
|
// }
|
|
|
- houseNumber.setElectricType("1");
|
|
|
- houseNumberService.updateById(houseNumber);
|
|
|
+ houseNumber.setElectricType("1");
|
|
|
+ houseNumberService.updateById(houseNumber);
|
|
|
|
|
|
// 之前的房间需要置脏，不需要关电，置净才需要关电
|
|
|
- HouseNumber houseNumber1 = houseNumberService.getById(initialHouseNumberId);
|
|
|
+ HouseNumber houseNumber1 = houseNumberService.getById(initialHouseNumberId);
|
|
|
// 房间置脏
|
|
|
- houseNumber1.setHouseStatus(2);
|
|
|
- houseNumberService.updateById(houseNumber1);
|
|
|
+ houseNumber1.setHouseStatus(2);
|
|
|
+ houseNumberService.updateById(houseNumber1);
|
|
|
|
|
|
// 旧房间密码删除，添加新房间密码
|
|
|
- Admin byId = adminService.getById(roomChangeDto.getAdminId());
|
|
|
+ Admin byId = adminService.getById(roomChangeDto.getAdminId());
|
|
|
|
|
|
- LambdaQueryWrapper<Unlocking> wrapperU = new LambdaQueryWrapper<>();
|
|
|
- wrapperU.eq(Unlocking::getOrderNumber, orderNumber)
|
|
|
- .eq(Unlocking::getHouseNumberId, initialHouseNumberId);
|
|
|
- Unlocking unlocking = unlockingService.getOne(wrapperU);
|
|
|
- if (ObjectUtils.isNotEmpty(unlocking)) {
|
|
|
+ LambdaQueryWrapper<Unlocking> wrapperU = new LambdaQueryWrapper<>();
|
|
|
+ wrapperU.eq(Unlocking::getOrderNumber, orderNumber)
|
|
|
+ .eq(Unlocking::getHouseNumberId, initialHouseNumberId);
|
|
|
+ Unlocking unlocking = unlockingService.getOne(wrapperU);
|
|
|
+ if (ObjectUtils.isNotEmpty(unlocking)) {
|
|
|
// 删除房间密码
|
|
|
- passwordIssController.deleteLockUser(unlocking.getLuid(), unlocking.getLockUserId());
|
|
|
- unlockingService.removeById(unlocking);
|
|
|
- OperatingRecord operatingRecord = new OperatingRecord();
|
|
|
-
|
|
|
- operatingRecord.setHouseNumberId(houseNumber1.getId());
|
|
|
- operatingRecord.setRoomNumber(houseNumber1.getRoomNumber());
|
|
|
- operatingRecord.setOperatorName(byId.getName());
|
|
|
- DateTimeFormatter dateTimeFormatter1 = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
|
|
|
- operatingRecord.setDataTime(LocalDateTime.now().format(dateTimeFormatter1));
|
|
|
- operatingRecord.setContent("姓名:" + houseOrder.getLiveName());
|
|
|
- operatingRecord.setType("删除锁钥匙");
|
|
|
- operatingRecordService.save(operatingRecord);
|
|
|
- }
|
|
|
- LambdaQueryWrapper<HouseLock> wrapperHl = new LambdaQueryWrapper<>();
|
|
|
- wrapperHl.eq(HouseLock::getHouseNumberId, houseNumberId);
|
|
|
- HouseLock houseLock = houseLockService.getOne(wrapperHl);
|
|
|
- if (ObjectUtils.isNotEmpty(unlocking)) {
|
|
|
+ passwordIssController.deleteLockUser(unlocking.getLuid(), unlocking.getLockUserId());
|
|
|
+ unlockingService.removeById(unlocking);
|
|
|
+ OperatingRecord operatingRecord = new OperatingRecord();
|
|
|
+
|
|
|
+ operatingRecord.setHouseNumberId(houseNumber1.getId());
|
|
|
+ operatingRecord.setRoomNumber(houseNumber1.getRoomNumber());
|
|
|
+ operatingRecord.setOperatorName(byId.getName());
|
|
|
+ DateTimeFormatter dateTimeFormatter1 = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
|
|
|
+ operatingRecord.setDataTime(LocalDateTime.now().format(dateTimeFormatter1));
|
|
|
+ operatingRecord.setContent("姓名:" + houseOrder.getLiveName());
|
|
|
+ operatingRecord.setType("删除锁钥匙");
|
|
|
+ operatingRecordService.save(operatingRecord);
|
|
|
+ }
|
|
|
+ LambdaQueryWrapper<HouseLock> wrapperHl = new LambdaQueryWrapper<>();
|
|
|
+ wrapperHl.eq(HouseLock::getHouseNumberId, houseNumberId);
|
|
|
+ HouseLock houseLock = houseLockService.getOne(wrapperHl);
|
|
|
+ if (ObjectUtils.isNotEmpty(unlocking)) {
|
|
|
|
|
|
|
|
|
- if (ObjectUtils.isNotEmpty(houseLock)) {
|
|
|
+ if (ObjectUtils.isNotEmpty(houseLock)) {
|
|
|
|
|
|
|
|
|
- String equipmentState = houseLock.getEquipmentType();
|
|
|
+ String equipmentState = houseLock.getEquipmentType();
|
|
|
|
|
|
// 入住人id
|
|
|
- String liveUsersId = houseOrder.getLiveUsersId();
|
|
|
- Users users = usersService.getById(liveUsersId);
|
|
|
+ String liveUsersId = houseOrder.getLiveUsersId();
|
|
|
+ Users users = usersService.getById(liveUsersId);
|
|
|
|
|
|
|
|
|
// 判断是什么类型的开锁方式
|
|
|
- String lockStatus = unlocking.getLockStatus();
|
|
|
- if (ObjectUtils.isNotEmpty(unlocking)) {
|
|
|
+ String lockStatus = unlocking.getLockStatus();
|
|
|
+ if (ObjectUtils.isNotEmpty(unlocking)) {
|
|
|
|
|
|
|
|
|
// 添加锁的操作记录
|
|
|
|
|
|
- OperatingRecord operatingRecord = new OperatingRecord();
|
|
|
+ OperatingRecord operatingRecord = new OperatingRecord();
|
|
|
|
|
|
- operatingRecord.setHouseNumberId(houseNumber.getId());
|
|
|
- operatingRecord.setRoomNumber(houseNumber.getRoomNumber());
|
|
|
- operatingRecord.setOperatorName(byId.getName());
|
|
|
- DateTimeFormatter dateTimeFormatter1 = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
|
|
|
- operatingRecord.setDataTime(LocalDateTime.now().format(dateTimeFormatter1));
|
|
|
- operatingRecord.setContent("姓名:" + houseOrder.getLiveName());
|
|
|
+ operatingRecord.setHouseNumberId(houseNumber.getId());
|
|
|
+ operatingRecord.setRoomNumber(houseNumber.getRoomNumber());
|
|
|
+ operatingRecord.setOperatorName(byId.getName());
|
|
|
+ DateTimeFormatter dateTimeFormatter1 = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
|
|
|
+ operatingRecord.setDataTime(LocalDateTime.now().format(dateTimeFormatter1));
|
|
|
+ operatingRecord.setContent("姓名:" + houseOrder.getLiveName());
|
|
|
|
|
|
- if ("1".equals(lockStatus)) {
|
|
|
- PasswordDto pr = new PasswordDto();
|
|
|
- pr.setLuid(houseLock.getEquipmentType());
|
|
|
+ if ("1".equals(lockStatus)) {
|
|
|
+ PasswordDto pr = new PasswordDto();
|
|
|
+ pr.setLuid(houseLock.getEquipmentType());
|
|
|
// 开始时间
|
|
|
- pr.setStartTime(String.valueOf(liveTime.getTime()));
|
|
|
+ pr.setStartTime(String.valueOf(liveTime.getTime()));
|
|
|
// 结束时间
|
|
|
- String reserveLeaveTime = houseOrder.getReserveLeaveTime();
|
|
|
- Date leaveTime = Date.from(LocalDateTime.parse(reserveLeaveTime, dateTimeFormatter1).atZone(ZoneId.systemDefault()).toInstant());
|
|
|
- pr.setEndTime(String.valueOf(leaveTime.getTime()));
|
|
|
- pr.setHouseNumberId(houseNumberId);
|
|
|
- pr.setOrderNumber(orderNumber);
|
|
|
- Unlocking unlocking1 = passwordIssController.addPassword(pr);
|
|
|
- unlockingService.save(unlocking1);
|
|
|
-
|
|
|
- String passWord = unlocking1.getPassWord();
|
|
|
-
|
|
|
- ArrayList<String> strings = new ArrayList<>();
|
|
|
- strings.add(users.getCardNumber());
|
|
|
- weiXiaoComponent.sendNotice(strings, "公寓办理入住成功", "办理入住成功", "您的房间号为:" + houseNumber.getRoomNumber() + ",密码是:" + passWord + "离店时间为:" + liveTime + ",欢迎您入住张玉玲酒店，我们全体员工很荣幸能为您服务，如有任何需要请致电张玉玲，期待为你服务。祝你生活愉快！", null);
|
|
|
- operatingRecord.setType("添加密码钥匙");
|
|
|
-
|
|
|
- } else if ("2".equals(lockStatus)) {
|
|
|
- CardInfoDto cid = new CardInfoDto();
|
|
|
- cid.setCard(users.getIdCardInformation());
|
|
|
- cid.setLuid(equipmentState);
|
|
|
- cid.setCardType(1);
|
|
|
- cid.setStartTime(String.valueOf(liveTime.getTime()));
|
|
|
- // 结束时间
|
|
|
- String reserveLeaveTime = houseOrder.getReserveLeaveTime();
|
|
|
- Date leaveTime = Date.from(LocalDateTime.parse(reserveLeaveTime, dateTimeFormatter1).atZone(ZoneId.systemDefault()).toInstant());
|
|
|
-
|
|
|
- cid.setEndTime(String.valueOf(leaveTime.getTime()));
|
|
|
- cid.setHouseNumberId(houseNumberId);
|
|
|
- cid.setOrderNumber(houseOrder.getOrderNumber());
|
|
|
- Unlocking unlocking1 = passwordIssController.addCardInfo(cid);
|
|
|
- unlockingService.save(unlocking1);
|
|
|
- operatingRecord.setType("添加卡片钥匙");
|
|
|
- } else if ("3".equals(lockStatus)) {
|
|
|
- FingerprintDataDto fd = new FingerprintDataDto();
|
|
|
- fd.setLuid(equipmentState);
|
|
|
- fd.setHouseNumberId(houseNumberId);
|
|
|
- fd.setOrderNumber(houseOrder.getOrderNumber());
|
|
|
- fd.setStartTime(String.valueOf(liveTime.getTime()));
|
|
|
- // 结束时间
|
|
|
- String reserveLeaveTime = houseOrder.getReserveLeaveTime();
|
|
|
- Date leaveTime = Date.from(LocalDateTime.parse(reserveLeaveTime, dateTimeFormatter1).atZone(ZoneId.systemDefault()).toInstant());
|
|
|
-
|
|
|
- fd.setEndTime(String.valueOf(leaveTime.getTime()));
|
|
|
-
|
|
|
- fd.setFingerprintData(users.getFingerprint());
|
|
|
- Unlocking unlocking1 = passwordIssController.addFingerprintData(fd);
|
|
|
- unlockingService.save(unlocking1);
|
|
|
- operatingRecord.setType("添加指纹钥匙");
|
|
|
- }
|
|
|
+ String reserveLeaveTime = houseOrder.getReserveLeaveTime();
|
|
|
+ Date leaveTime = Date.from(LocalDateTime.parse(reserveLeaveTime, dateTimeFormatter1).atZone(ZoneId.systemDefault()).toInstant());
|
|
|
+ pr.setEndTime(String.valueOf(leaveTime.getTime()));
|
|
|
+ pr.setHouseNumberId(houseNumberId);
|
|
|
+ pr.setOrderNumber(orderNumber);
|
|
|
+ Unlocking unlocking1 = passwordIssController.addPassword(pr);
|
|
|
+ unlockingService.save(unlocking1);
|
|
|
+
|
|
|
+ String passWord = unlocking1.getPassWord();
|
|
|
+
|
|
|
+ ArrayList<String> strings = new ArrayList<>();
|
|
|
+ strings.add(users.getCardNumber());
|
|
|
+ weiXiaoComponent.sendNotice(strings, "公寓办理入住成功", "办理入住成功", "您的房间号为:" + houseNumber.getRoomNumber() + ",密码是:" + passWord + "离店时间为:" + liveTime + ",欢迎您入住张玉玲酒店，我们全体员工很荣幸能为您服务，如有任何需要请致电张玉玲，期待为你服务。祝你生活愉快！", null);
|
|
|
+ operatingRecord.setType("添加密码钥匙");
|
|
|
+
|
|
|
+ } else if ("2".equals(lockStatus)) {
|
|
|
+ CardInfoDto cid = new CardInfoDto();
|
|
|
+ cid.setCard(users.getIdCardInformation());
|
|
|
+ cid.setLuid(equipmentState);
|
|
|
+ cid.setCardType(1);
|
|
|
+ cid.setStartTime(String.valueOf(liveTime.getTime()));
|
|
|
+ // 结束时间
|
|
|
+ String reserveLeaveTime = houseOrder.getReserveLeaveTime();
|
|
|
+ Date leaveTime = Date.from(LocalDateTime.parse(reserveLeaveTime, dateTimeFormatter1).atZone(ZoneId.systemDefault()).toInstant());
|
|
|
+
|
|
|
+ cid.setEndTime(String.valueOf(leaveTime.getTime()));
|
|
|
+ cid.setHouseNumberId(houseNumberId);
|
|
|
+ cid.setOrderNumber(houseOrder.getOrderNumber());
|
|
|
+ Unlocking unlocking1 = passwordIssController.addCardInfo(cid);
|
|
|
+ unlockingService.save(unlocking1);
|
|
|
+ operatingRecord.setType("添加卡片钥匙");
|
|
|
+ } else if ("3".equals(lockStatus)) {
|
|
|
+ FingerprintDataDto fd = new FingerprintDataDto();
|
|
|
+ fd.setLuid(equipmentState);
|
|
|
+ fd.setHouseNumberId(houseNumberId);
|
|
|
+ fd.setOrderNumber(houseOrder.getOrderNumber());
|
|
|
+ fd.setStartTime(String.valueOf(liveTime.getTime()));
|
|
|
+ // 结束时间
|
|
|
+ String reserveLeaveTime = houseOrder.getReserveLeaveTime();
|
|
|
+ Date leaveTime = Date.from(LocalDateTime.parse(reserveLeaveTime, dateTimeFormatter1).atZone(ZoneId.systemDefault()).toInstant());
|
|
|
+
|
|
|
+ fd.setEndTime(String.valueOf(leaveTime.getTime()));
|
|
|
+
|
|
|
+ fd.setFingerprintData(users.getFingerprint());
|
|
|
+ Unlocking unlocking1 = passwordIssController.addFingerprintData(fd);
|
|
|
+ unlockingService.save(unlocking1);
|
|
|
+ operatingRecord.setType("添加指纹钥匙");
|
|
|
+ }
|
|
|
|
|
|
- operatingRecordService.save(operatingRecord);
|
|
|
+ operatingRecordService.save(operatingRecord);
|
|
|
+ }
|
|
|
}
|
|
|
}
|
|
|
- }
|
|
|
- if (msg.equals("")) {
|
|
|
- return CommonResult.ok();
|
|
|
- } else {
|
|
|
- return CommonResult.ok(msg);
|
|
|
+ if (msg.equals("")) {
|
|
|
+ return CommonResult.ok();
|
|
|
+ } else {
|
|
|
+ return CommonResult.ok(msg);
|
|
|
+ }
|
|
|
}
|
|
|
|
|
|
}
|
