优化 代码

wuxw

2023-10-09 a340aad437a1a3853bc887f69881597b0e44a12b

 service-job/src/main/java/com/java110/job/adapt/fee/OweFeeCallableAdapt.java

@@ -179,6 +179,11 @@
        OweFeeCallablePo oweFeeCallablePo = null;

        for (ReportOweFeeDto reportOweFeeDto : feeDtos) {

            // todo  校验 时间范围
            if (!hasInTime(reportOweFeeDto, data)) {
                continue;
            }
            oweFeeCallablePo = new OweFeeCallablePo();

            oweFeeCallablePo.setAmountdOwed(reportOweFeeDto.getAmountOwed());
@@ -259,5 +264,32 @@

    }

    private boolean hasInTime(ReportOweFeeDto tempFeeDto, JSONObject reqJson) {
        if (!reqJson.containsKey("startTime") || !reqJson.containsKey("endTime")) {
            return true;
        }

        String startTime = reqJson.getString("startTime");
        String endTime = reqJson.getString("endTime");

        if (StringUtil.isEmpty(startTime) || StringUtil.isEmpty(endTime)) {
            return true;
        }
        if (StringUtil.isEmpty(tempFeeDto.getDeadlineTime())) {
            return true;
        }
        if (StringUtil.isEmpty(tempFeeDto.getEndTime())) {
            return true;
        }

        if (DateUtil.getDateFromStringB(tempFeeDto.getEndTime()).before(DateUtil.getDateFromStringB(startTime))
                && DateUtil.getDateFromStringB(tempFeeDto.getDeadlineTime()).after(DateUtil.getDateFromStringB(endTime))
        ) {
            return true;
        }

        return false;
    }


}