修改bug

src/main/java/com/template/api/HouseNumberControllerAPI.java

@@ -71,7 +71,7 @@ public interface HouseNumberControllerAPI {
     void houseNumberExport(HttpServletResponse response);
 
     @PostMapping("/importHouseNumbers")
-    @ApiOperation(value = "房间水电编码导入", notes = "房间水电编码导入", httpMethod = "POST")
+    @ApiOperation(value = "房间导入", notes = "房间导入", httpMethod = "POST")
     CommonResult importHouseNumbers(@RequestParam("file") MultipartFile file) throws Exception;
 
 

src/main/java/com/template/api/HouseOrderAPI.java

@@ -139,5 +139,10 @@ public interface HouseOrderAPI {
     @ApiOperation(value = "备注", notes = "备注", httpMethod = "GET")
     CommonResult saveRemark(@RequestParam Integer houseOrderId,@RequestParam String remark);
 
+
+    @PostMapping("/payNotCheckIn")
+    @ApiOperation(value = "订单管理-已支付未入住", notes = "订单管理-已支付未入住", httpMethod = "POST")
+    CommonResult payNotCheckIn(@RequestBody CancelDto cancelDto);
+
 }
 

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

@@ -322,19 +322,23 @@ public class HouseNumberController implements HouseNumberControllerAPI {
         Sheet sheet = workbook.createSheet("水电设备绑定表");
         Row headerRow = sheet.createRow(0);
         headerRow.createCell(0).setCellValue("序号");
-        headerRow.createCell(1).setCellValue("水表编码");
-        headerRow.createCell(2).setCellValue("电表编码");
-        headerRow.createCell(3).setCellValue("房型类型");
-        headerRow.createCell(4).setCellValue("房型名称");
-        headerRow.createCell(5).setCellValue("房间号");
+        headerRow.createCell(1).setCellValue("楼栋");
+        headerRow.createCell(2).setCellValue("单元");
+        headerRow.createCell(3).setCellValue("水表编码");
+        headerRow.createCell(4).setCellValue("电表编码");
+        headerRow.createCell(5).setCellValue("房型类型");
+        headerRow.createCell(6).setCellValue("房型名称");
+        headerRow.createCell(7).setCellValue("房间号");
 
         if (ObjectUtils.isNotEmpty(vos) && vos.size() > 0) {
             for (int i = 0; i < vos.size(); i++) {
                 Row dataRow1 = sheet.createRow(i + 1);
                 HouseNumberPageVo vo = vos.get(i);
                 dataRow1.createCell(0).setCellValue(i + 1);
-                dataRow1.createCell(1).setCellValue(vo.getWaterEquipmentMeterName());
-                dataRow1.createCell(2).setCellValue(vo.getElectricEquipmentMeterName());
+                dataRow1.createCell(1).setCellValue(vo.getBuilding());
+                dataRow1.createCell(2).setCellValue(vo.getElement());
+                dataRow1.createCell(3).setCellValue(vo.getWaterEquipmentMeterName());
+                dataRow1.createCell(4).setCellValue(vo.getElectricEquipmentMeterName());
                 Integer roomType = vo.getRoomType();
                 String houseType = "";
                 if (1 == roomType) {
@@ -342,9 +346,9 @@ public class HouseNumberController implements HouseNumberControllerAPI {
                 } else {
                     houseType = "钟点房";
                 }
-                dataRow1.createCell(3).setCellValue(houseType);
-                dataRow1.createCell(4).setCellValue(vo.getHouseName());
-                dataRow1.createCell(5).setCellValue(vo.getRoomNumber());
+                dataRow1.createCell(5).setCellValue(houseType);
+                dataRow1.createCell(6).setCellValue(vo.getHouseName());
+                dataRow1.createCell(7).setCellValue(vo.getRoomNumber());
 
             }
         }
@@ -362,9 +366,28 @@ public class HouseNumberController implements HouseNumberControllerAPI {
         for (int i = 0; i < dtos.size(); i++) {
             HouseNumberImportDto dto = dtos.get(i);
 
-            Integer roomType = dto.getRoomType();
-//            房间号
+            //            判断是否存在该楼栋单元
+            String building = dto.getBuilding();
+            String element = dto.getElement();
+
+            LambdaQueryWrapper<Building> wrapper = new LambdaQueryWrapper<>();
+            wrapper.eq(Building::getBuilding, building)
+                    .eq(Building::getElement, element);
+            Building one = buildingService.getOne(wrapper);
+            if (ObjectUtils.isEmpty(one)) {
+                return CommonResult.fail("第" + (i + 2) + "行," + "不存在" + building + "/" + element + "该楼栋单元");
+            }
+            Integer id = one.getId();
+            //            判断该房间号是否已经存在
+            //            房间号
             String roomNumber = dto.getRoomNumber();
+            HouseNumber hn = houseNumberService.getBRoomNumber(id, roomNumber);
+            if (ObjectUtils.isEmpty(hn)) {
+                return CommonResult.fail("第" + (i + 2) + "行," + "该楼栋单元下不存在" + roomNumber + "房间号");
+            }
+
+
+            Integer roomType = dto.getRoomType();
 //            房型
             String houseName = dto.getHouseName();
 
@@ -707,81 +730,104 @@ public class HouseNumberController implements HouseNumberControllerAPI {
     }
 
     @Override
+    @Transactional(rollbackFor = Exception.class)
     public CommonResult importHouseNumbers(MultipartFile file) throws Exception {
         List<HouseNumbersImportDto> dtos = ExcelUtils.readMultipartFile(file, HouseNumbersImportDto.class);
 
         ArrayList<HouseNumber> houseNumbers = new ArrayList<>();
-        for (int i = 0; i < dtos.size(); i++) {
-            HouseNumbersImportDto dto = dtos.get(i);
-            HouseNumber houseNumber = new HouseNumber();
 
-//            判断是否存在该楼栋单元
-            String building = dto.getBuilding();
-            String element = dto.getElement();
+        try {
 
-            LambdaQueryWrapper<Building> wrapper = new LambdaQueryWrapper<>();
-            wrapper.eq(Building::getBuilding, building)
-                    .eq(Building::getElement, element);
-            Building one = buildingService.getOne(wrapper);
-            if (ObjectUtils.isEmpty(one)) {
-                return CommonResult.fail("第" + (i + 2) + "行," + "不存在" + building+"/"+element + "该楼栋单元");
-            }
-            Integer bId = one.getId();
-            houseNumber.setBuildingId(bId);
+            for (int i = 0; i < dtos.size(); i++) {
+                HouseNumbersImportDto dto = dtos.get(i);
+                HouseNumber houseNumber = new HouseNumber();
+
+//            判断是否存在该楼栋单元
+                String building = dto.getBuilding();
+                String element = dto.getElement();
+
+                LambdaQueryWrapper<Building> wrapper = new LambdaQueryWrapper<>();
+                wrapper.eq(Building::getBuilding, building)
+                        .eq(Building::getElement, element);
+                Building one = buildingService.getOne(wrapper);
+                if (ObjectUtils.isEmpty(one)) {
+                    return CommonResult.fail("第" + (i + 2) + "行," + "不存在" + building + "/" + element + "该楼栋单元");
+                }
+                Integer bId = one.getId();
+                houseNumber.setBuildingId(bId);
 
 //            判断是否存在该房型
-            Integer roomType = dto.getRoomType();
+                Integer roomType = dto.getRoomType();
 //            房型
-            String houseName = dto.getHouseName();
+                String houseName = dto.getHouseName();
 
-            //            判断当前房型是否存在当前房间号
-            House house = houseService.getHouseName(houseName, roomType);
-            if (ObjectUtils.isEmpty(house)) {
-                return CommonResult.fail("第" + (i + 2) + "行," + "不存在" + houseName + "该房型");
-            }
-            houseNumber.setHouseId(house.getId()+"");
+                //            判断当前房型是否存在当前房间号
+                House house = houseService.getHouseName(houseName, roomType);
+                if (ObjectUtils.isEmpty(house)) {
+                    return CommonResult.fail("第" + (i + 2) + "行," + "不存在" + houseName + "该房型");
+                }
+                houseNumber.setHouseId(house.getId() + "");
 
 //            判断该房间号是否已经存在
-            //            房间号
-            String roomNumber = dto.getRoomNumber();
-            HouseNumber hn = houseNumberService.getBRoomNumber(bId, roomNumber);
-            if (ObjectUtils.isNotEmpty(hn)) {
-                return CommonResult.fail("第" + (i + 2) + "行," + "该楼栋单元下已存在" + roomNumber + "该房间号");
-            }
-            houseNumber.setRoomNumber(roomNumber);
+                //            房间号
+                String roomNumber = dto.getRoomNumber();
+                HouseNumber hn = houseNumberService.getBRoomNumber(bId, roomNumber);
+                if (ObjectUtils.isNotEmpty(hn)) {
+                    return CommonResult.fail("第" + (i + 2) + "行," + "该楼栋单元下已存在" + roomNumber + "该房间号");
+                }
+                houseNumber.setRoomNumber(roomNumber);
 
-            String electricEquipmentMeterName = dto.getElectricEquipmentMeterName();
-            LambdaQueryWrapper<ElectricEquipment> wrapperEE = new LambdaQueryWrapper<>();
-            wrapperEE.eq(ElectricEquipment::getMeterName, electricEquipmentMeterName);
-            ElectricEquipment electricEquipment = electricEquipmentService.getOne(wrapperEE);
 
-            if (ObjectUtils.isEmpty(electricEquipment)) {
-                return CommonResult.fail("第" + (i + 2) + "行," + "不存在" + electricEquipmentMeterName + "该电表设备号");
-            }
+                String electricEquipmentMeterName = dto.getElectricEquipmentMeterName();
+                LambdaQueryWrapper<ElectricEquipment> wrapperEE = new LambdaQueryWrapper<>();
+                wrapperEE.eq(ElectricEquipment::getMeterName, electricEquipmentMeterName);
+                ElectricEquipment electricEquipment = electricEquipmentService.getOne(wrapperEE);
 
-            String waterEquipmentMeterName = dto.getWaterEquipmentMeterName();
-            LambdaQueryWrapper<WaterEquipment> wrapperWE = new LambdaQueryWrapper<>();
-            wrapperWE.eq(WaterEquipment::getMeterName, waterEquipmentMeterName);
-            WaterEquipment waterEquipment = waterEquipmentService.getOne(wrapperWE);
-            if (ObjectUtils.isEmpty(waterEquipment)) {
-                return CommonResult.fail("第" + (i + 2) + "行," + "不存在" + waterEquipmentMeterName + "该水表设备号");
-            }
+                if (ObjectUtils.isEmpty(electricEquipment)) {
+                    return CommonResult.fail("第" + (i + 2) + "行," + "不存在" + electricEquipmentMeterName + "该电表设备号");
+                }
 
-            houseNumber.setElectricEquipmentId(electricEquipment.getId() + "");
-            houseNumber.setElectricEquipmentMeterName(electricEquipment.getMeterName());
-            houseNumber.setWaterEquipmentId(waterEquipment.getId() + "");
-            houseNumber.setWaterEquipmentMeterName(waterEquipment.getMeterName());
+                String waterEquipmentMeterName = dto.getWaterEquipmentMeterName();
+                LambdaQueryWrapper<WaterEquipment> wrapperWE = new LambdaQueryWrapper<>();
+                wrapperWE.eq(WaterEquipment::getMeterName, waterEquipmentMeterName);
+                WaterEquipment waterEquipment = waterEquipmentService.getOne(wrapperWE);
+                if (ObjectUtils.isEmpty(waterEquipment)) {
+                    return CommonResult.fail("第" + (i + 2) + "行," + "不存在" + waterEquipmentMeterName + "该水表设备号");
+                }
 
-            houseNumber.setHouseStatus(1);
-            houseNumber.setElectricType("2");
+                houseNumber.setElectricEquipmentId(electricEquipment.getId() + "");
+                houseNumber.setElectricEquipmentMeterName(electricEquipment.getMeterName());
+                houseNumber.setWaterEquipmentId(waterEquipment.getId() + "");
+                houseNumber.setWaterEquipmentMeterName(waterEquipment.getMeterName());
+
+                houseNumber.setHouseStatus(1);
+                houseNumber.setElectricType("2");
+
+                houseNumbers.add(houseNumber);
+
+                houseNumberService.save(houseNumber);
+
+                //            门锁
+                String doorLock = dto.getDoorLock();
+                if (ObjectUtils.isNotEmpty(doorLock)) {
+                    HouseLock houseLock = new HouseLock();
+                    houseLock.setHouseNumberId(houseNumber.getId());
+                    houseLock.setEquipmentType(doorLock);
+                    houseLock.setNetworkType("WIFI");
+                    houseLock.setWifiMac("WIFIMAC");
+                    houseLock.setBindingTime(new Date());
+                    houseLock.setElectricQuantity("0");
+                    houseLock.setNetworkState("1");
+                    houseLock.setEquipmentState("1");
+                    houseLock.setNfcFunction(0);
+                    houseLockService.save(houseLock);
+                }
 
-            houseNumbers.add(houseNumber);
-        }
-        boolean b = houseNumberService.saveBatch(houseNumbers);
-        if (b) {
-            return CommonResult.ok();
+            }
+        }catch (Exception e){
+            e.printStackTrace();
         }
-        return CommonResult.fail();
+        return CommonResult.ok();
     }
 
 

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

@@ -677,8 +677,8 @@ public class HouseOrderController implements HouseOrderAPI {
             wrapperHo.eq(HouseOrder::getOrderNumber, orderNumber);
             HouseOrder houseOrder = houseOrderService.getOne(wrapperHo);
             String orderStatus = houseOrder.getOrderStatus();
-            if (!("1".equals(orderStatus)||"2".equals(orderStatus)||"3".equals(orderStatus))) {
-                return CommonResult.fail("该订单不是待支付,已支付，待入住，不能直接取消");
+            if (!("1".equals(orderStatus))) {
+                return CommonResult.fail("该订单不是待支付,不能直接取消");
             }
 
 // 修改订单状态
@@ -1586,9 +1586,9 @@ public class HouseOrderController implements HouseOrderAPI {
 
         String s = "";
         if ("1".equals(state)) {
-            s = "2,3,4,8";
+            s = "2,3,4,8，10";
         } else {
-            s = "1,5";
+            s = "5";
         }
 
         PageUtils<ReportStatisticsVo> pageUtils = houseOrderService.reportStatisticsPage(s, keyWord, startTime, endTime, page, size);
@@ -1617,9 +1617,9 @@ public class HouseOrderController implements HouseOrderAPI {
 
         String s = "";
         if ("1".equals(state)) {
-            s = "2,3,4,8";
+            s = "2,3,4,8，10";
         } else {
-            s = "1,5";
+            s = "5";
         }
 
         List<ReportStatisticsExportVo> vos = houseOrderService.reportStatisticsExport(s, keyWord, startTime, endTime);
@@ -3185,6 +3185,49 @@ public class HouseOrderController implements HouseOrderAPI {
         return CommonResult.ok();
     }
 
+    @Override
+    public CommonResult payNotCheckIn(CancelDto cancelDto) {
+        int adminId = cancelDto.getAdminId();
+        PermissionSetting permissionSetting = permissionSettingService.getById(adminId);
+        if (ObjectUtils.isEmpty(permissionSetting)) {
+            return CommonResult.fail("非法进入");
+        }
+
+        String houseNumberId = cancelDto.getHouseNumberId();
+        String orderNumber = cancelDto.getOrderNumber();
+        if (ObjectUtils.isEmpty(houseNumberId) && ObjectUtils.isEmpty(orderNumber)) {
+            return CommonResult.fail();
+        }
+        try {
+
+            LambdaQueryWrapper<HouseOrder> wrapperHo = new LambdaQueryWrapper<>();
+            wrapperHo.eq(HouseOrder::getOrderNumber, orderNumber);
+            HouseOrder houseOrder = houseOrderService.getOne(wrapperHo);
+
+
+// 修改订单状态
+            houseOrder.setOrderStatus("10");
+//  设置取消时间
+            houseOrder.setCancelTime(new Date());
+
+            LambdaQueryWrapper<HouseNumberState> wrapperHns = new LambdaQueryWrapper<>();
+            wrapperHns.eq(HouseNumberState::getHouseNumberId, houseNumberId)
+                    .eq(HouseNumberState::getOrderNumber, orderNumber);
+            HouseNumberState houseNumberState = houseNumberStateService.getOne(wrapperHns);
+            SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+            houseNumberState.setEndTime(sdf.format(new Date()));
+
+            houseOrderService.updateById(houseOrder);
+//            houseNumberStateService.updateById(houseNumberState);
+            houseNumberStateService.removeById(houseNumberState.getId());
+            return CommonResult.ok();
+
+        } catch (Exception e) {
+            e.printStackTrace();
+            return CommonResult.fail();
+        }
+    }
+
 
     public static void main(String[] args) throws Exception {
 //        获取签名

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

@@ -9,6 +9,12 @@ public class HouseNumberImportDto {
     @ExcelImport("序号")
     private Integer serialNumber;
 
+    @ExcelImport("楼栋")
+    private String building;
+
+    @ExcelImport("单元")
+    private String element;
+
     @ExcelImport(value = "水表编码")
     private String waterEquipmentMeterName;