导入测试

chengf

2026-01-30 b8bf2507bc7b23c90bc6dc71ea2460e277d3800a

 service-job/src/main/java/com/java110/job/importData/adapt/ImportPhoneBillFeeV2QueueDataAdapt.java

@@ -100,7 +100,6 @@
        PayFeePo payFeePo = BeanConvertUtil.covertBean(reqJson, PayFeePo.class);
        payFeePo.setCommunityId(po.getCommunityId());
        payFeePo.setFeeId(po.getFeeId());
        payFeePo.setIncomeObjId(reqJson.getString("storeId"));
        payFeePo.setAmount(po.getPayableAmount());
        if (payFeePo.getAmount().isEmpty()){
            payFeePo.setAmount("-1");
@@ -116,7 +115,7 @@
        payFeePo.setPayerObjType(FeeDto.PAYER_OBJ_TYPE_ROOM);
        payFeePo.setbId("-1");
        payFeePo.setFeeFlag(FeeDto.FEE_FLAG_ONCE);
        payFeePo.setState(FeeDto.STATE_DOING);
        payFeePo.setState(FeeDto.STATE_FINISH);
        payFeePo.setIncomeObjId("102025062610470035");
        payFeePo.setUserId("-1");

@@ -198,48 +197,51 @@
    private void validateRoom(PhoneBillFlow po) {
        RoomDto roomDto = new RoomDto();
        roomDto.setRoadName(po.getRoadName());
        roomDto.setFloorNum(po.getFloorNum());
        roomDto.setFloorNum(Vtil.defaultValueToNumber(po.getFloorNum()));
        roomDto.setCommunityId(po.getCommunityId());
        roomDto.setUnitNum(po.getUnitNum());
        roomDto.setRoomNum(po.getRoomNum());
        roomDto.setUnitNum(Vtil.defaultValueToNumber(po.getUnitNum()));
        roomDto.setRoomNum(Vtil.defaultValueToNumber(po.getRoomNum()));
        if (roomDto.getRoomNum().isEmpty()) {
            roomDto.setRoomNumIsNull("yes");
        }
        List<RoomDto> roomDtos = roomInnerServiceSMOImpl.queryRooms(roomDto);
        if (roomDtos.isEmpty()) {
//            throw new IllegalArgumentException("未查询到房屋：" + po.getObjName());
            ImportOwnerRoomDto importOwnerRoomDto = new ImportOwnerRoomDto();//房屋
            importOwnerRoomDto.setUserId(po.getUserId());
            importOwnerRoomDto.setRoomId(GenerateCodeFactory.getGeneratorId(GenerateCodeFactory.CODE_PREFIX_roomId));
            importOwnerRoomDto.setOwnerId(GenerateCodeFactory.getGeneratorId(GenerateCodeFactory.CODE_PREFIX_ownerId));
            importOwnerRoomDto.setUserId(po.getUserId());
            importOwnerRoomDto.setLayerCount("0");
            importOwnerRoomDto.setLayer("0");
            importOwnerRoomDto.setLift("未知");
            importOwnerRoomDto.setSection("10102");
            importOwnerRoomDto.setOwnerTypeCd("1001");
            importOwnerRoomDto.setPersonType(OwnerDto.PERSON_TYPE_PERSON);
            importOwnerRoomDto.setPersonRole(OwnerDto.PERSON_ROLE_OWNER);
            importOwnerRoomDto.setRoomSubType(RoomDto.ROOM_SUB_TYPE_HOUSE);
            importOwnerRoomDto.setCommunityId(po.getCommunityId());//小区编号
            //---------

            importOwnerRoomDto.setRoadName(roomDto.getRoadName());//路名
            importOwnerRoomDto.setFloorNum(roomDto.getFloorNum());//弄
            importOwnerRoomDto.setUnitNum(roomDto.getUnitNum());//门
            importOwnerRoomDto.setRoomNum(roomDto.getRoomNum());//室
            importOwnerRoomDto.setDoorRoomNum(roomDto.getUnitNum() + "-" + roomDto.getRoomNum());//门市号
            importOwnerRoomDto.setPropertyAddress(
                    roomDto.getRoadName() + roomDto.getFloorNum() + roomDto.getUnitNum() + roomDto.getRoomNum()
            );//业主地址
            importOwnerRoomDto.setBuiltUpArea("0");//面积
            importOwnerRoomDto.setRoomArea("0");//面积
            importOwnerRoomDto.setRoomRent("0");//面积
            importOwnerRoomDto.setSellState(RoomDto.STATE_FREE);//房屋状态
            importOwnerRoomDto.setRoomState(Vtil.defaultValue(importOwnerRoomDto.getOwnerName()).equals("") ? "2004" : "2001");
            int i = importOwnerRoomInnerServiceSMOImpl.saveOwnerRoom(importOwnerRoomDto);

            if (i == 0) {
                throw new IllegalArgumentException("房屋添加错误");
            }
            po.setRoomId(importOwnerRoomDto.getRoomId());
            throw new IllegalArgumentException("未查询到房屋：" + po.getAddress());
//            ImportOwnerRoomDto importOwnerRoomDto = new ImportOwnerRoomDto();//房屋
//            importOwnerRoomDto.setUserId(po.getUserId());
//            importOwnerRoomDto.setRoomId(GenerateCodeFactory.getGeneratorId(GenerateCodeFactory.CODE_PREFIX_roomId));
//            importOwnerRoomDto.setOwnerId(GenerateCodeFactory.getGeneratorId(GenerateCodeFactory.CODE_PREFIX_ownerId));
//            importOwnerRoomDto.setUserId(po.getUserId());
//            importOwnerRoomDto.setLayerCount("0");
//            importOwnerRoomDto.setLayer("0");
//            importOwnerRoomDto.setLift("未知");
//            importOwnerRoomDto.setSection("10102");
//            importOwnerRoomDto.setOwnerTypeCd("1001");
//            importOwnerRoomDto.setPersonType(OwnerDto.PERSON_TYPE_PERSON);
//            importOwnerRoomDto.setPersonRole(OwnerDto.PERSON_ROLE_OWNER);
//            importOwnerRoomDto.setRoomSubType(RoomDto.ROOM_SUB_TYPE_HOUSE);
//            importOwnerRoomDto.setCommunityId(po.getCommunityId());//小区编号
//            //---------
//
//            importOwnerRoomDto.setRoadName(roomDto.getRoadName());//路名
//            importOwnerRoomDto.setFloorNum(roomDto.getFloorNum());//弄
//            importOwnerRoomDto.setUnitNum(roomDto.getUnitNum());//门
//            importOwnerRoomDto.setRoomNum(roomDto.getRoomNum());//室
//            importOwnerRoomDto.setDoorRoomNum(roomDto.getUnitNum() + "-" + roomDto.getRoomNum());//门市号
//            importOwnerRoomDto.setPropertyAddress(
//                    roomDto.getRoadName() + roomDto.getFloorNum() + roomDto.getUnitNum() + roomDto.getRoomNum()
//            );//业主地址
//            importOwnerRoomDto.setBuiltUpArea("0");//面积
//            importOwnerRoomDto.setRoomArea("0");//面积
//            importOwnerRoomDto.setRoomRent("0");//面积
//            importOwnerRoomDto.setSellState(RoomDto.STATE_FREE);//房屋状态
//            importOwnerRoomDto.setRoomState(Vtil.defaultValue(importOwnerRoomDto.getOwnerName()).equals("") ? "2004" : "2001");
//            int i = importOwnerRoomInnerServiceSMOImpl.saveOwnerRoom(importOwnerRoomDto);
//
//            if (i == 0) {
//                throw new IllegalArgumentException("房屋添加错误");
//            }
//            po.setRoomId(importOwnerRoomDto.getRoomId());
        } else if (roomDtos.size() > 1) {
            throw new IllegalArgumentException("存在重复的房屋，详见导入详情");
        } else {