更新房态换房接口

src/main/java/com/template/controller/HouseNumberStateController.java

@@ -1317,89 +1317,92 @@ public class HouseNumberStateController implements HouseNumberStateAPI {
         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("")) {

src/main/java/com/template/controller/HouseOrderController.java

@@ -1418,6 +1418,8 @@ public class HouseOrderController implements HouseOrderAPI {
         String liveUsersId = houseOrder.getLiveUsersId();
         Users users = usersService.getById(liveUsersId);
 
+
+
         if (ObjectUtils.isNotEmpty(unlocking)) {
 
 //            判断是什么类型的开锁方式