chengf
2025-08-07 58432ef29b81162f9744133560a1634d87f00633
service-job/src/main/java/com/java110/job/importData/adapt/ImportHistoryFeeDetailQueueDataAdapt.java
@@ -93,7 +93,7 @@
            importRoomFee.setFeeName(data.getString("secondaryFeeTypeCd"));
            importRoomFee.setDetailId(assetImportLogDetailDto.getDetailId());
            importRoomFee.setStartTime(data.getString("chargeStart"));
            importRoomFee.setEndTime(data.getString("chargeEnd"));
            importRoomFee.setEndTime(data.getString("chargeEnd").split(" ")[0]+" 23:59:59");
            importRoomFee.setCreateTime(data.getString("inputTime"));
            importRoomFee.setReceivableAmount(data.getString("bankDepositAmount"));
            importRoomFee.setAmount(data.getString("chargeAmount"));
@@ -261,8 +261,21 @@
        if (saved < 1) {
            return;
        }
        FeeDto fee = new FeeDto();
        fee.setFeeId(tmpFeeDto.getFeeId());
        FeeDto feeInfo = feeInnerServiceSMOImpl.queryFees(fee).get(0);
        if (feeInfo.getEndTime().after(feeInfo.getMaxEndTime()) || feeInfo.getEndTime().getTime() == feeInfo.getMaxEndTime().getTime()) {
            PayFeePo payFeePo = new PayFeePo();
            payFeePo.setFeeId(feeInfo.getFeeId());
            payFeePo.setState(FeeDto.STATE_FINISH);
            int i = feeInnerServiceSMOImpl.updateFee(payFeePo);
        }
//        int i = feeInnerServiceSMOImpl.updateFee(feeInfo);
        if (tmpFeeDto.getEndTime().getTime() >= DateUtil.getDateFromStringB(importRoomFee.getEndTime()).getTime()) {
            return;
        }