导入测试

chengf

2026-02-25 64b14b0549344f13b191e2c26ed199f62655c43f

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

@@ -22,6 +22,7 @@
import com.java110.fee.api.FeeDiscountApi;
import com.java110.fee.cmd.fee.PayFeeCmd;
import com.java110.fee.cmd.fee.PayFeePreCmd;
import com.java110.fee.feeMonth.IPayFeeMonth;
import com.java110.intf.IImportPropertyWhiteListfFlowServiceSMO;
import com.java110.intf.common.ICarInoutInnerServiceSMO;
import com.java110.intf.community.ICommunityInnerServiceSMO;
@@ -349,6 +350,9 @@
        }

        try{
            if(assetImportLogDetailDto.getOutTime() == null) {
                assetImportLogDetailDto.setOutTime("2050-01-01 23:59:59");
            }
            if(!(ListUtil.isNull(importRoomFees))){
                if (DateUtil.getDateFromStringB(data.getString("chargeStart").split(" ")[0]).getTime() < DateUtil.getDateFromStringB(assetImportLogDetailDto.getTakeTime().split(" ")[0]).getTime() && !assetImportLogDetailDto.getState().equals("1100") && !assetImportLogDetailDto.getState().equals("1300")){
                    ImportRoomFee original = importRoomFees.get(0);
@@ -564,6 +568,11 @@
     *
     * @param importRoomFee
     */


    @Autowired
    private IPayFeeMonth payFeeMonthImpl;

    private void importFeeDetail(ImportRoomFee importRoomFee, String storeId, String userId, String batchId) {

        if (importRoomFee.getState() == null){
@@ -746,6 +755,10 @@
            payFeeDetailPo.setReceivableAmount(computeFeeByCycle(tmpFeeDto,importRoomFee)+"");
            payFeeDetailPo.setDiscountAmount("0");
            int saved = feeDetailInnerServiceSMOImpl.saveFeeDetail(payFeeDetailPo);

            payFeeMonthImpl.doGeneratorFeeMonths(Collections.singletonList(payFeeDetailPo.getFeeId()), payFeeDetailPo.getCommunityId());

            payFeeMonthImpl.doGeneratorOweFees(Collections.singletonList(payFeeDetailPo.getFeeId()), payFeeDetailPo.getCommunityId());
            return;
        }

@@ -807,6 +820,9 @@
        }

        if (saved < 1) {
            payFeeMonthImpl.doGeneratorFeeMonths(Collections.singletonList(payFeeDetailPo.getFeeId()), payFeeDetailPo.getCommunityId());

            payFeeMonthImpl.doGeneratorOweFees(Collections.singletonList(payFeeDetailPo.getFeeId()), payFeeDetailPo.getCommunityId());
            return;
        }

@@ -818,7 +834,9 @@
//        int i = feeInnerServiceSMOImpl.updateFee(feeInfo);

        if (tmpFeeDto.getEndTime().getTime() >= DateUtil.getDateFromStringA(importRoomFee.getEndTime()).getTime()  + 2000 || (importRoomFee.getState().equals("1100") || importRoomFee.getState().equals("1300"))) {
            payFeeMonthImpl.doGeneratorFeeMonths(Collections.singletonList(payFeeDetailPo.getFeeId()), payFeeDetailPo.getCommunityId());

            payFeeMonthImpl.doGeneratorOweFees(Collections.singletonList(payFeeDetailPo.getFeeId()), payFeeDetailPo.getCommunityId());
            return;
        }

@@ -881,6 +899,10 @@
                int i = feeInnerServiceSMOImpl.updateFee(payFee);
            }
        }

        payFeeMonthImpl.doGeneratorFeeMonths(Collections.singletonList(payFeeDetailPo.getFeeId()), payFeeDetailPo.getCommunityId());

        payFeeMonthImpl.doGeneratorOweFees(Collections.singletonList(payFeeDetailPo.getFeeId()), payFeeDetailPo.getCommunityId());
    }

    private double computeFee(FeeDto fee,ImportRoomFee importRoomFee) {