修改房态入住，订单入住

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

@@ -796,7 +796,7 @@ public class HouseNumberStateController implements HouseNumberStateAPI {
             return CommonResult.fail("此账号暂无该权限");
         }
         String houseNumberId = checkIdCardDto.getHouseNumberId();
-        String cardNumber = checkIdCardDto.getCardNumber();
+
         String houseId = checkIdCardDto.getHouseId();
         String liveTime = checkIdCardDto.getLiveTime();
         String leaveTime = checkIdCardDto.getLeaveTime();
@@ -820,7 +820,7 @@ public class HouseNumberStateController implements HouseNumberStateAPI {
 //        入住人
         String liveName = checkIdCardDto.getLiveName();
 //        电话
-        String phone = checkIdCardDto.getPhone();
+//        String phone = checkIdCardDto.getPhone();
 
 //        指纹特殊编码
         String fingerprint = checkIdCardDto.getFingerprint();
@@ -832,9 +832,7 @@ public class HouseNumberStateController implements HouseNumberStateAPI {
 
 //        判断是否有用户
             LambdaQueryWrapper<Users> wrapperU = new LambdaQueryWrapper<>();
-            wrapperU.eq(Users::getUserName, liveName)
-                    .eq(Users::getPhone, phone)
-                    .eq(ObjectUtils.isNotEmpty(cardNumber), Users::getCardNumber, cardNumber);
+            wrapperU.eq(Users::getIdCard, idCard);
             Users users = usersService.getOne(wrapperU);
 
 //        判断是否有订单，没有订单需先添加订单
@@ -849,8 +847,8 @@ public class HouseNumberStateController implements HouseNumberStateAPI {
             if (ObjectUtils.isEmpty(users)) {
                 Users users1 = new Users();
                 users1.setUserName(liveName);
-                users1.setPhone(phone);
-                users1.setCardNumber(cardNumber);
+//                users1.setPhone(phone);
+//                users1.setCardNumber(cardNumber);
                 users1.setFingerprint(fingerprint);
                 users1.setIdCard(idCard);
                 users1.setIdCardInformation(idCardInformation);
@@ -858,7 +856,7 @@ public class HouseNumberStateController implements HouseNumberStateAPI {
                 boolean save = usersService.save(users1);
 //                houseOrder.setLiveUsersId(users1.getId() + "");
             } else {
-                users.setCardNumber(cardNumber);
+//                users.setCardNumber(cardNumber);
                 users.setFingerprint(fingerprint);
                 users.setIdCard(idCard);
                 users.setIdCardInformation(idCardInformation);
@@ -890,14 +888,6 @@ public class HouseNumberStateController implements HouseNumberStateAPI {
             houseNumberState.setStatus(4);
             houseNumberState.setStartTime(liveTime);
 
-//        获取设备id
-            LambdaQueryWrapper<HouseLock> wrapperHl = new LambdaQueryWrapper<>();
-            wrapperHl.eq(HouseLock::getHouseNumberId, houseNumberId);
-            HouseLock houseLock = houseLockService.getOne(wrapperHl);
-            if (ObjectUtils.isEmpty(houseLock)) {
-                return CommonResult.fail("请先绑定门锁设备");
-            }
-            String equipmentState = houseLock.getEquipmentType();
 
             //      修改房间状态
             HouseNumber houseNumber = houseNumberService.getById(houseNumberId);
@@ -913,7 +903,7 @@ public class HouseNumberStateController implements HouseNumberStateAPI {
             String start = String.valueOf(liveDate.getTime());
             String end = String.valueOf(leaveDate.getTime());
 //        发放密码
-            String lockStatus = checkIdCardDto.getLockStatus();
+            Integer lockStatus = checkIdCardDto.getLockStatus();
 //        添加锁的操作记录
             Admin byId = adminService.getById(checkIdCardDto.getAdminId());
 
@@ -924,52 +914,85 @@ public class HouseNumberStateController implements HouseNumberStateAPI {
             operatingRecord.setOperatorName(byId.getName());
             operatingRecord.setDataTime(LocalDateTime.now().format(dateTimeFormatter1));
             operatingRecord.setContent("姓名:" + liveName);
-
-            if ("1".equals(lockStatus)) {
-                PasswordDto pr = new PasswordDto();
-                pr.setLuid(equipmentState);
-                pr.setStartTime(start);
-                pr.setEndTime(end);
-                pr.setHouseNumberId(houseNumberId);
-                pr.setOrderNumber(houseOrder.getOrderNumber());
-                Unlocking unlocking = passwordIssController.addPassword(pr);
+            houseOrder.setKeyType(lockStatus);
+            if (5==lockStatus) {
+//                默认未归还
+                houseOrder.setGiveBack(2);
+            }else {
+                //        获取设备id
+                LambdaQueryWrapper<HouseLock> wrapperHl = new LambdaQueryWrapper<>();
+                wrapperHl.eq(HouseLock::getHouseNumberId, houseNumberId);
+                HouseLock houseLock = houseLockService.getOne(wrapperHl);
+                if (ObjectUtils.isEmpty(houseLock)) {
+                    return CommonResult.fail("请先绑定门锁设备");
+                }
+                String equipmentState = houseLock.getEquipmentType();
+
+                if (1==lockStatus) {
+                    PasswordDto pr = new PasswordDto();
+                    pr.setLuid(equipmentState);
+                    pr.setStartTime(start);
+                    pr.setEndTime(end);
+                    pr.setHouseNumberId(houseNumberId);
+                    pr.setOrderNumber(houseOrder.getOrderNumber());
+                    Unlocking unlocking = passwordIssController.addPassword(pr);
 //                添加锁的操作记录类型
-                operatingRecord.setType("添加密码钥匙");
-
-                unlockingService.save(unlocking);
-                String passWord = unlocking.getPassWord();
-                ArrayList<String> strings = new ArrayList<>();
-                strings.add(cardNumber);
-                weiXiaoComponent.sendNotice(strings, "公寓办理入住成功", "办理入住成功", "您的房间号为:" + roomNumber + ",密码是:" + passWord + "离店时间为:" + liveTime + ",欢迎您入住张玉玲酒店，我们全体员工很荣幸能为您服务，如有任何需要请致电张玉玲，期待为你服务。祝你生活愉快！", null);
-            } else if ("2".equals(lockStatus)) {
-                CardInfoDto cid = new CardInfoDto();
-                cid.setCard(idCardInformation);
-                cid.setLuid(equipmentState);
-                cid.setCardType(1);
-                cid.setStartTime(start);
-                cid.setEndTime(end);
-                cid.setHouseNumberId(houseNumberId);
-                cid.setOrderNumber(houseOrder.getOrderNumber());
-                Unlocking unlocking = passwordIssController.addCardInfo(cid);
-                unlockingService.save(unlocking);
-
-                //                添加锁的操作记录类型
-                operatingRecord.setType("添加卡片钥匙");
-            } else if ("3".equals(lockStatus)) {
-                FingerprintDataDto fd = new FingerprintDataDto();
-                fd.setLuid(equipmentState);
-                fd.setHouseNumberId(houseNumberId);
-                fd.setOrderNumber(houseOrder.getOrderNumber());
-                fd.setStartTime(start);
-                fd.setEndTime(end);
-                fd.setFingerprintData(fingerprint);
-                Unlocking unlocking = passwordIssController.addFingerprintData(fd);
-                unlockingService.save(unlocking);
-                //                添加锁的操作记录类型
-                operatingRecord.setType("添加指纹钥匙");
+                    operatingRecord.setType("添加密码钥匙");
+
+                    unlockingService.save(unlocking);
+                    String passWord = unlocking.getPassWord();
+                    houseOrder.setKeyPassWord(passWord);
+//                ArrayList<String> strings = new ArrayList<>();
+                    // strings.add(cardNumber);
+                    // weiXiaoComponent.sendNotice(strings, "公寓办理入住成功", "办理入住成功", "您的房间号为:" + roomNumber + ",密码是:" + passWord + "离店时间为:" + liveTime + ",欢迎您入住张玉玲酒店，我们全体员工很荣幸能为您服务，如有任何需要请致电张玉玲，期待为你服务。祝你生活愉快！", null);
+                } else if (2==lockStatus) {
+                    CardInfoDto cid = new CardInfoDto();
+                    cid.setCard(idCardInformation);
+                    cid.setLuid(equipmentState);
+                    cid.setCardType(0);
+                    cid.setStartTime(start);
+                    cid.setEndTime(end);
+                    cid.setHouseNumberId(houseNumberId);
+                    cid.setOrderNumber(houseOrder.getOrderNumber());
+                    Unlocking unlocking = passwordIssController.addCardInfo(cid);
+                    unlockingService.save(unlocking);
+
+                    //                添加锁的操作记录类型
+                    operatingRecord.setType("添加卡片钥匙");
+                    //                默认未归还
+                    houseOrder.setGiveBack(2);
+
+                } else if (3==lockStatus) {
+                    FingerprintDataDto fd = new FingerprintDataDto();
+                    fd.setLuid(equipmentState);
+                    fd.setHouseNumberId(houseNumberId);
+                    fd.setOrderNumber(houseOrder.getOrderNumber());
+                    fd.setStartTime(start);
+                    fd.setEndTime(end);
+                    fd.setFingerprintData(fingerprint);
+                    Unlocking unlocking = passwordIssController.addFingerprintData(fd);
+                    unlockingService.save(unlocking);
+                    //                添加锁的操作记录类型
+                    operatingRecord.setType("添加指纹钥匙");
+                }else if (4==lockStatus){
+                    CardInfoDto cid = new CardInfoDto();
+                    cid.setCard(idCardInformation);
+                    cid.setLuid(equipmentState);
+                    cid.setCardType(1);
+                    cid.setStartTime(start);
+                    cid.setEndTime(end);
+                    cid.setHouseNumberId(houseNumberId);
+                    cid.setOrderNumber(houseOrder.getOrderNumber());
+                    Unlocking unlocking = passwordIssController.addCardInfo(cid);
+                    unlockingService.save(unlocking);
+
+                    //                添加锁的操作记录类型
+                    operatingRecord.setType("添加身份证钥匙");
+                    //                默认未归还
+                    houseOrder.setGiveBack(2);
+                }
             }
 
-
             houseOrderService.updateById(houseOrder);
             houseNumberStateService.updateById(houseNumberState);
 

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

@@ -733,7 +733,7 @@ public class HouseOrderController implements HouseOrderAPI {
             return CommonResult.fail("此账号暂无该权限");
         }
         String houseNumberId = checkIdCardDto.getHouseNumberId();
-        String cardNumber = checkIdCardDto.getCardNumber();
+//        String cardNumber = checkIdCardDto.getCardNumber();
         String houseId = checkIdCardDto.getHouseId();
         String liveTime = checkIdCardDto.getLiveTime();
         String leaveTime = checkIdCardDto.getLeaveTime();
@@ -757,7 +757,7 @@ public class HouseOrderController implements HouseOrderAPI {
 //        入住人
         String liveName = checkIdCardDto.getLiveName();
 //        电话
-        String phone = checkIdCardDto.getPhone();
+//        String phone = checkIdCardDto.getPhone();
 //        指纹特殊编码
         String fingerprint = checkIdCardDto.getFingerprint();
 //        身份证
@@ -768,9 +768,7 @@ public class HouseOrderController implements HouseOrderAPI {
 
 //        判断是否有用户
             LambdaQueryWrapper<Users> wrapperU = new LambdaQueryWrapper<>();
-            wrapperU.eq(Users::getUserName, liveName)
-                    .eq(Users::getPhone, phone)
-                    .eq(ObjectUtils.isNotEmpty(cardNumber), Users::getCardNumber, cardNumber);
+            wrapperU.eq(Users::getIdCard, idCard);
             Users users = usersService.getOne(wrapperU);
 
 //        判断是否有订单，没有订单需先添加订单
@@ -805,8 +803,6 @@ public class HouseOrderController implements HouseOrderAPI {
             if (ObjectUtils.isEmpty(users)) {
                 Users users1 = new Users();
                 users1.setUserName(liveName);
-                users1.setPhone(phone);
-                users1.setCardNumber(cardNumber);
                 users1.setFingerprint(fingerprint);
                 users1.setIdCard(idCard);
                 users1.setIdCardInformation(idCardInformation);
@@ -814,7 +810,6 @@ public class HouseOrderController implements HouseOrderAPI {
                 boolean save = usersService.save(users1);
                 houseOrder.setLiveUsersId(users1.getId() + "");
             } else {
-                users.setCardNumber(cardNumber);
                 users.setFingerprint(fingerprint);
                 users.setIdCard(idCard);
                 users.setIdCardInformation(idCardInformation);
@@ -847,11 +842,6 @@ public class HouseOrderController implements HouseOrderAPI {
             houseNumberState.setStatus(4);
             houseNumberState.setStartTime(liveTime);
 
-//        获取设备id
-            LambdaQueryWrapper<HouseLock> wrapperHl = new LambdaQueryWrapper<>();
-            wrapperHl.eq(HouseLock::getHouseNumberId, houseNumberId);
-            HouseLock houseLock = houseLockService.getOne(wrapperHl);
-            String equipmentState = houseLock.getEquipmentType();
 
             //      修改房间状态
             HouseNumber houseNumber = houseNumberService.getById(houseNumberId);
@@ -867,7 +857,7 @@ public class HouseOrderController implements HouseOrderAPI {
             String start = String.valueOf(liveDate.getTime());
             String end = String.valueOf(leaveDate.getTime());
 //        发放密码
-            String lockStatus = checkIdCardDto.getLockStatus();
+            Integer lockStatus = checkIdCardDto.getLockStatus();
 
 //            添加锁的操作记录
             Admin byId = adminService.getById(checkIdCardDto.getAdminId());
@@ -880,44 +870,81 @@ public class HouseOrderController implements HouseOrderAPI {
             operatingRecord.setContent("姓名:" + houseOrder.getLiveName());
 
 
-            if ("1".equals(lockStatus)) {
-                PasswordDto pr = new PasswordDto();
-                pr.setLuid(equipmentState);
-                pr.setStartTime(start);
-                pr.setEndTime(end);
-                pr.setHouseNumberId(houseNumberId);
-                pr.setOrderNumber(houseOrder.getOrderNumber());
-                Unlocking unlocking = passwordIssController.addPassword(pr);
-                unlockingService.save(unlocking);
-
-                String passWord = unlocking.getPassWord();
-                ArrayList<String> strings = new ArrayList<>();
-                strings.add(cardNumber);
-                weiXiaoComponent.sendNotice(strings, "公寓办理入住成功", "办理入住成功", "您的房间号为:" + roomNumber + ",密码是:" + passWord + "离店时间为:" + liveTime + ",欢迎您入住张玉玲酒店，我们全体员工很荣幸能为您服务，如有任何需要请致电张玉玲，期待为你服务。祝你生活愉快！", null);
-                operatingRecord.setType("添加密码钥匙");
-            } else if ("2".equals(lockStatus)) {
-                CardInfoDto cid = new CardInfoDto();
-                cid.setCard(idCardInformation);
-                cid.setLuid(equipmentState);
-                cid.setCardType(1);
-                cid.setStartTime(start);
-                cid.setEndTime(end);
-                cid.setHouseNumberId(houseNumberId);
-                cid.setOrderNumber(houseOrder.getOrderNumber());
-                Unlocking unlocking = passwordIssController.addCardInfo(cid);
-                unlockingService.save(unlocking);
-                operatingRecord.setType("添加卡片钥匙");
-            } else if ("3".equals(lockStatus)) {
-                FingerprintDataDto fd = new FingerprintDataDto();
-                fd.setLuid(equipmentState);
-                fd.setHouseNumberId(houseNumberId);
-                fd.setOrderNumber(houseOrder.getOrderNumber());
-                fd.setStartTime(start);
-                fd.setEndTime(end);
-                fd.setFingerprintData(fingerprint);
-                Unlocking unlocking = passwordIssController.addFingerprintData(fd);
-                unlockingService.save(unlocking);
-                operatingRecord.setType("添加指纹钥匙");
+            houseOrder.setKeyType(lockStatus);
+            if (5==lockStatus) {
+//                默认未归还
+                houseOrder.setGiveBack(2);
+            }else {
+                //        获取设备id
+                LambdaQueryWrapper<HouseLock> wrapperHl = new LambdaQueryWrapper<>();
+                wrapperHl.eq(HouseLock::getHouseNumberId, houseNumberId);
+                HouseLock houseLock = houseLockService.getOne(wrapperHl);
+                if (ObjectUtils.isEmpty(houseLock)) {
+                    return CommonResult.fail("请先绑定门锁设备");
+                }
+                String equipmentState = houseLock.getEquipmentType();
+
+                if (1==lockStatus) {
+                    PasswordDto pr = new PasswordDto();
+                    pr.setLuid(equipmentState);
+                    pr.setStartTime(start);
+                    pr.setEndTime(end);
+                    pr.setHouseNumberId(houseNumberId);
+                    pr.setOrderNumber(houseOrder.getOrderNumber());
+                    Unlocking unlocking = passwordIssController.addPassword(pr);
+//                添加锁的操作记录类型
+                    operatingRecord.setType("添加密码钥匙");
+
+                    unlockingService.save(unlocking);
+                    String passWord = unlocking.getPassWord();
+                    houseOrder.setKeyPassWord(passWord);
+//                ArrayList<String> strings = new ArrayList<>();
+                    // strings.add(cardNumber);
+                    // weiXiaoComponent.sendNotice(strings, "公寓办理入住成功", "办理入住成功", "您的房间号为:" + roomNumber + ",密码是:" + passWord + "离店时间为:" + liveTime + ",欢迎您入住张玉玲酒店，我们全体员工很荣幸能为您服务，如有任何需要请致电张玉玲，期待为你服务。祝你生活愉快！", null);
+                } else if (2==lockStatus) {
+                    CardInfoDto cid = new CardInfoDto();
+                    cid.setCard(idCardInformation);
+                    cid.setLuid(equipmentState);
+                    cid.setCardType(0);
+                    cid.setStartTime(start);
+                    cid.setEndTime(end);
+                    cid.setHouseNumberId(houseNumberId);
+                    cid.setOrderNumber(houseOrder.getOrderNumber());
+                    Unlocking unlocking = passwordIssController.addCardInfo(cid);
+                    unlockingService.save(unlocking);
+
+                    //                添加锁的操作记录类型
+                    operatingRecord.setType("添加卡片钥匙");
+                    //                默认未归还
+                    houseOrder.setGiveBack(2);
+
+                } else if (3==lockStatus) {
+                    FingerprintDataDto fd = new FingerprintDataDto();
+                    fd.setLuid(equipmentState);
+                    fd.setHouseNumberId(houseNumberId);
+                    fd.setOrderNumber(houseOrder.getOrderNumber());
+                    fd.setStartTime(start);
+                    fd.setEndTime(end);
+                    fd.setFingerprintData(fingerprint);
+                    Unlocking unlocking = passwordIssController.addFingerprintData(fd);
+                    unlockingService.save(unlocking);
+                    //                添加锁的操作记录类型
+                    operatingRecord.setType("添加指纹钥匙");
+                }else if (4==lockStatus){
+                    CardInfoDto cid = new CardInfoDto();
+                    cid.setCard(idCardInformation);
+                    cid.setLuid(equipmentState);
+                    cid.setCardType(1);
+                    cid.setStartTime(start);
+                    cid.setEndTime(end);
+                    cid.setHouseNumberId(houseNumberId);
+                    cid.setOrderNumber(houseOrder.getOrderNumber());
+                    Unlocking unlocking = passwordIssController.addCardInfo(cid);
+                    unlockingService.save(unlocking);
+
+                    //                添加锁的操作记录类型
+                    operatingRecord.setType("添加身份证钥匙");
+                }
             }
 
 

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

@@ -180,7 +180,7 @@ public class PasswordIssController {
             String end = sdf.format(Long.valueOf(ciq.getEndTime()));
             unlocking.setStartTime(start);
             unlocking.setEndTime(end);
-            unlocking.setType("4");
+//            unlocking.setType("4");
 
 
             return unlocking;

src/main/java/com/template/model/dto/CheckIdCardDto.java

@@ -17,11 +17,11 @@ public class CheckIdCardDto {
     //  入住人姓名
     private String liveName;
     //  入住人电话
-    private String phone;
+//    private String phone;
     //    入住人身份证号
     private String idCard;
     //    入住人卡号(不传则无法使用密码开锁)
-    private String cardNumber;
+//    private String cardNumber;
     //   入住时间
     private String liveTime;
     //    离开时间
@@ -31,7 +31,7 @@ public class CheckIdCardDto {
     //    入住天数
     private int liveDay;
     //   开锁方式
-    private String lockStatus;
+    private Integer lockStatus;
     //    指纹特征码
     private String fingerprint;
     //    身份证特殊码

src/main/java/com/template/model/pojo/HouseOrder.java

@@ -119,10 +119,10 @@ public class HouseOrder implements Serializable {
     private Integer keyType;
 
     @ApiModelProperty(value = "开锁密码")
-    private String key_pass_word;
+    private String keyPassWord;
 
     @ApiModelProperty(value = "是否归还 1:已归还，2：未归还")
-    private Integer give_back;
+    private Integer giveBack;
 
     @ApiModelProperty(value = "创建时间")
     @TableField(fill = FieldFill.INSERT)