白单流水报表与费用初始化（差创建折扣使用记录）0821

chengf

2025-08-21 bde271fdbab51e654a293dba02a31eab8ff3ea8b

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

@@ -109,6 +109,19 @@
     */
    private void importCarFeeDetail(ImportRoomFee importRoomFee, String storeId, String userId, String batchId) {

        PayFeeDetailPo payFeeDetailPo = new PayFeeDetailPo();
        payFeeDetailPo.setPayOrderId(importRoomFee.getRoomId());
        payFeeDetailPo.setCycles(importRoomFee.getCycle());
        payFeeDetailPo.setCreateTime(importRoomFee.getCreateTime());
        payFeeDetailPo.setCommunityId(importRoomFee.getCommunityId());
        payFeeDetailPo.setPayOrderId(importRoomFee.getRoomId());
        int count = feeDetailInnerServiceSMOImpl.queryFeeDetailsCountByVo(payFeeDetailPo);

        if (count > 0) {
            throw new IllegalStateException("重复的缴费记录");
        }


        FeeConfigDto feeConfigDto = new FeeConfigDto();
        feeConfigDto.setFeeNameEq(importRoomFee.getFeeName().trim());
        feeConfigDto.setCommunityId(importRoomFee.getCommunityId());
@@ -129,40 +142,41 @@

        List<PayFeePo> payFeePos = null;
        if (ListUtil.isNull(feeDtos)) {
            PayFeePo payFeePo = new PayFeePo();
            payFeePo.setCommunityId(importRoomFee.getCommunityId());
            payFeePo.setConfigId(feeDto.getConfigId());
            payFeePo.setPayerObjType(FeeDto.PAYER_OBJ_TYPE_CAR);
            payFeePo.setStartTime(importRoomFee.getStartTime());
            payFeePo.setEndTime(importRoomFee.getEndTime());
            payFeePo.setAmount(importRoomFee.getAmount());
            payFeePo.setFeeFlag(tmpFeeConfigDto.getFeeFlag());
            payFeePo.setFeeTypeCd(tmpFeeConfigDto.getFeeTypeCd());
            payFeePo.setIncomeObjId(storeId);
            payFeePo.setBatchId(batchId);
            if (FeeDto.FEE_FLAG_ONCE.equals(tmpFeeConfigDto.getFeeFlag())) {
                payFeePo.setState(FeeDto.STATE_FINISH);
            } else {
                payFeePo.setState(FeeDto.STATE_DOING);
            }
            payFeePo.setFeeId(GenerateCodeFactory.getGeneratorId(GenerateCodeFactory.CODE_PREFIX_feeId));
            payFeePo.setPayerObjId(importRoomFee.getCarId());
            payFeePo.setUserId(userId);
            payFeePo.setCreateTime(importRoomFee.getCreateTime());
            payFeePos = new ArrayList<>();
            payFeePos.add(payFeePo);
            feeInnerServiceSMOImpl.saveFee(payFeePos);
            List<FeeAttrPo> feeAttrsPos = new ArrayList<>();
            //查询业主信息
            if (!FeeDto.FEE_FLAG_CYCLE.equals(tmpFeeConfigDto.getFeeFlag())) {
                feeAttrsPos.add(addFeeAttr(payFeePo, FeeAttrDto.SPEC_CD_ONCE_FEE_DEADLINE_TIME,
                        importRoomFee.getEndTime()));
            }
            feeAttrsPos.add(addFeeAttr(payFeePo, FeeAttrDto.SPEC_CD_OWNER_ID, importRoomFee.getOwnerId()));
            feeAttrsPos.add(addFeeAttr(payFeePo, FeeAttrDto.SPEC_CD_OWNER_LINK, importRoomFee.getOwnerLink()));
            feeAttrsPos.add(addFeeAttr(payFeePo, FeeAttrDto.SPEC_CD_OWNER_NAME, importRoomFee.getOwnerName()));
            feeAttrInnerServiceSMOImpl.saveFeeAttrs(feeAttrsPos);
            feeDtos = feeInnerServiceSMOImpl.queryFees(feeDto);
            throw new IllegalArgumentException("不存在对应的缴费记录");
//            PayFeePo payFeePo = new PayFeePo();
//            payFeePo.setCommunityId(importRoomFee.getCommunityId());
//            payFeePo.setConfigId(feeDto.getConfigId());
//            payFeePo.setPayerObjType(FeeDto.PAYER_OBJ_TYPE_CAR);
//            payFeePo.setStartTime(importRoomFee.getStartTime());
//            payFeePo.setEndTime(importRoomFee.getEndTime());
//            payFeePo.setAmount(importRoomFee.getAmount());
//            payFeePo.setFeeFlag(tmpFeeConfigDto.getFeeFlag());
//            payFeePo.setFeeTypeCd(tmpFeeConfigDto.getFeeTypeCd());
//            payFeePo.setIncomeObjId(storeId);
//            payFeePo.setBatchId(batchId);
//            if (FeeDto.FEE_FLAG_ONCE.equals(tmpFeeConfigDto.getFeeFlag())) {
//                payFeePo.setState(FeeDto.STATE_FINISH);
//            } else {
//                payFeePo.setState(FeeDto.STATE_DOING);
//            }
//            payFeePo.setFeeId(GenerateCodeFactory.getGeneratorId(GenerateCodeFactory.CODE_PREFIX_feeId));
//            payFeePo.setPayerObjId(importRoomFee.getCarId());
//            payFeePo.setUserId(userId);
//            payFeePo.setCreateTime(importRoomFee.getCreateTime());
//            payFeePos = new ArrayList<>();
//            payFeePos.add(payFeePo);
//            feeInnerServiceSMOImpl.saveFee(payFeePos);
//            List<FeeAttrPo> feeAttrsPos = new ArrayList<>();
//            //查询业主信息
//            if (!FeeDto.FEE_FLAG_CYCLE.equals(tmpFeeConfigDto.getFeeFlag())) {
//                feeAttrsPos.add(addFeeAttr(payFeePo, FeeAttrDto.SPEC_CD_ONCE_FEE_DEADLINE_TIME,
//                        importRoomFee.getEndTime()));
//            }
//            feeAttrsPos.add(addFeeAttr(payFeePo, FeeAttrDto.SPEC_CD_OWNER_ID, importRoomFee.getOwnerId()));
//            feeAttrsPos.add(addFeeAttr(payFeePo, FeeAttrDto.SPEC_CD_OWNER_LINK, importRoomFee.getOwnerLink()));
//            feeAttrsPos.add(addFeeAttr(payFeePo, FeeAttrDto.SPEC_CD_OWNER_NAME, importRoomFee.getOwnerName()));
//            feeAttrInnerServiceSMOImpl.saveFeeAttrs(feeAttrsPos);
//            feeDtos = feeInnerServiceSMOImpl.queryFees(feeDto);
        }

        for (FeeDto tmpFeeDto : feeDtos) {
@@ -191,6 +205,7 @@
        payFeeDetailPo.setPrimeRate("1.0");
        payFeeDetailPo.setFeeId(tmpFeeDto.getFeeId());
        payFeeDetailPo.setStartTime(importRoomFee.getStartTime());
        importRoomFee.setPayObjId(payFeeDetailPo.getPayOrderId() != null ? importRoomFee.getPayObjId() : importRoomFee.getRoomId());
        String endTime = importRoomFee.getEndTime();
        //todo 周期性费用时时间自动加一天，因为物业统计的Excel 一般少一天
        if (!FeeDto.FEE_FLAG_ONCE.equals(tmpFeeDto.getFeeFlag())) {
@@ -207,6 +222,8 @@
        payFeeDetailPo.setState("1400");
        payFeeDetailPo.setCashierName(importRoomFee.getStaffName());
        payFeeDetailPo.setPayableAmount(importRoomFee.getAmount());
        payFeeDetailPo.setPayOrderId(payFeeDetailPo.getPayOrderId() !=null ? payFeeDetailPo.getPayOrderId() : importRoomFee.getRoomId());
        payFeeDetailPo.setbId(importRoomFee.getBatchId());
        int saved = feeDetailInnerServiceSMOImpl.saveFeeDetail(payFeeDetailPo);

        if (saved < 1) {