优化账单费用 加入账单生成期

wuxw

2023-10-25 c03932c8b4d3558e2c9b11ade3c9155a8dc7f2b5

 java110-utils/src/main/java/com/java110/utils/util/DateUtil.java

@@ -407,15 +407,24 @@

    public static Date getNextMonthFirstDate(String curDate) {
        Date date = DateUtil.getDateFromStringB(curDate);
        return getNextMonthFirstDate(date);
    }

    public static Date getNextMonthFirstDate(Date curDate) {

        return getNextMonthFirstDate(curDate,1);
    }

    public static Date getNextMonthFirstDate(Date curDate,int monthCount) {

        Calendar curDateCal = Calendar.getInstance();
        curDateCal.setTime(date);
        Calendar calendar = Calendar.getInstance();
        calendar.set(Calendar.DAY_OF_MONTH, 1);
        calendar.set(Calendar.HOUR_OF_DAY, 0);
        calendar.set(Calendar.MINUTE, 0);
        calendar.set(Calendar.SECOND, 0);
        calendar.add(Calendar.MONTH, 1);
        return calendar.getTime();
        curDateCal.setTime(curDate);
        curDateCal.set(Calendar.DAY_OF_MONTH, 1);
        curDateCal.set(Calendar.HOUR_OF_DAY, 0);
        curDateCal.set(Calendar.MINUTE, 0);
        curDateCal.set(Calendar.SECOND, 0);
        curDateCal.add(Calendar.MONTH, monthCount);
        return curDateCal.getTime();
    }

    public static Date getFirstDate() {
@@ -808,12 +817,12 @@
        return calendar.getTime();
    }

    public static boolean sameMonthDay(Date startDate,Date endDate){
    public static boolean sameMonthDay(Date startDate, Date endDate) {
        Calendar startCalendar = Calendar.getInstance();
        startCalendar.setTime(startDate);
        Calendar endCalender = Calendar.getInstance();
        endCalender.setTime(endDate);
        if(startCalendar.get(Calendar.DAY_OF_MONTH) == endCalender.get(Calendar.DAY_OF_MONTH)){
        if (startCalendar.get(Calendar.DAY_OF_MONTH) == endCalender.get(Calendar.DAY_OF_MONTH)) {
            return true;
        }