暂存0827

chengf

2025-08-27 074caee550216dfd4bb676677ae33cbd837c5710

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

@@ -119,6 +119,24 @@
        }
    }


    public void importCarFeeDetails2(String storeId, String userId, List<ImportRoomFee> importCarFees, String batchId) {

        importCarFees = ownerCarInnerServiceSMOImpl.freshCarIds(importCarFees);
        for (ImportRoomFee importCarFee : importCarFees) {
            try {
                if (StringUtil.isEmpty(importCarFee.getCarNum())) {
                    continue;
                }
                importCarFeeDetail(importCarFee, storeId, userId, batchId);
                updateImportLogDetailState(importCarFee.getDetailId());
            } catch (Exception e) {
                updateImportLogDetailState(importCarFee.getDetailId(), e);
                throw new IllegalArgumentException(e);
            }
        }
    }

    /**
     * 导入 费用历史
     *
@@ -141,7 +159,7 @@
        }
        List<RoomDto> roomDtos = iRoomInnerServiceSMOImpl.queryRooms(roomDto);
        try {
            if (importRoomFee.getPayObjId().equals("7777")){
            if (importRoomFee.getPayObjId() != null && importRoomFee.getPayObjId().equals("7777")){
                ContractPartyaDto contractPartyaDto = new ContractPartyaDto();
                contractPartyaDto.setPartyA(importRoomFee.getDoorRoomNum());
                List<ContractPartyaDto> contractPartyaDtos = contractPartyaInnerServiceSMOImpl.queryContractPartyas(contractPartyaDto);
@@ -154,8 +172,13 @@
                importRoomFee.setRoomId(roomDtos.get(0).getRoomId());
            }
        }catch (Exception e){
            updateImportLogDetailState(importRoomFee.getDetailId(),new IllegalArgumentException("费用项"+importRoomFee.getFeeName()+"不存在"));
            throw new IllegalArgumentException("门室号/合同主体："+importRoomFee.getDoorRoomNum()+"未查询到");
            if (importRoomFee.getPayObjId() != null &&importRoomFee.getPayObjId().equals("7777")){
                updateImportLogDetailState(importRoomFee.getDetailId(),new IllegalArgumentException("合同主体："+importRoomFee.getDoorRoomNum()+"未查询到"));
                throw new IllegalArgumentException("合同主体："+importRoomFee.getDoorRoomNum()+"未查询到");
            }else {
                updateImportLogDetailState(importRoomFee.getDetailId(), new IllegalArgumentException("门室号：" + importRoomFee.getDoorRoomNum() + "未查询到"));
                throw new IllegalArgumentException("门室号：" + importRoomFee.getDoorRoomNum() + "未查询到");
            }
        }
        PayFeeDetailPo payFeeDetailPo = new PayFeeDetailPo();
        payFeeDetailPo.setPayOrderId(importRoomFee.getRoomId());
@@ -278,7 +301,7 @@
        ResponseEntity<String> resultVo = null;
        try {
            resultVo = feeDiscountApi.computeFeeDiscount(tmpFeeDto.getFeeId(), tmpFeeDto.getCommunityId(), 105, importRoomFee.getPayObjId(),
                    tmpFeeDto.getPayerObjType(), importRoomFee.getEndTime(), importRoomFee.getEndTime(), importRoomFee.getStartTime(), 1, 20);
                    tmpFeeDto.getPayerObjType(), importRoomFee.getEndTime(), importRoomFee.getStartTime(), importRoomFee.getEndTime(), 1, 20);
        } catch (ParseException e) {
            throw new RuntimeException(e);
        }
@@ -314,9 +337,9 @@
            payFeeDetailDiscount.setCommunityId(feeDtos.get(0).getCommunityId());
            payFeeDetailDiscount.setFeeId(feeDtos.get(0).getFeeId());
            payFeeDetailDiscount.setDetailDiscountId(GenerateCodeFactory.getGeneratorId(GenerateCodeFactory.CODE_PREFIX_discountId));
            payFeeDetailDiscountNewV1InnerServiceSMOImpl.savePayFeeDetailDiscountNew(payFeeDetailDiscount);
        }

        payFeeDetailDiscountNewV1InnerServiceSMOImpl.savePayFeeDetailDiscountNew(payFeeDetailDiscount);

        if (saved < 1) {
            return;