winter 1 год назад
Родитель
Сommit
17319dc302
2 измененных файлов: 9 добавлений и 3 удалений
  1. +7
    -3
      mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java
  2. +2
    -0
      mallinkService/src/main/java/com/iformall/utils/DateUtils.java

+ 7
- 3
mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java Просмотреть файл

@@ -2367,8 +2367,11 @@ public class WxRentContractServiceImpl implements WxRentContractService {
}
public static void main(String[] args) {
Date startDate = DateUtils.stringToDate("2024-08-01 00:00:00", DateUtils.DATE_TIME_PATTERN);
Date endDate = DateUtils.stringToDate("2024-09-11 23:59:59", DateUtils.DATE_TIME_PATTERN);
Date startDate = DateUtils.stringToDate("2023-12-20 00:00:00", DateUtils.DATE_TIME_PATTERN);
Date endDate = DateUtils.stringToDate("2024-12-19 00:00:00", DateUtils.DATE_TIME_PATTERN);
int days = DateUtils.daysBetween(startDate, endDate)+1;
System.out.println(days);
Date realEndStart = DateUtils.getDaySet(endDate, Calendar.SECOND, 1);
int[] diffs = DateUtils.getDiff(startDate, realEndStart);
Date preextraStartDay = DateUtils.getTimeAfterMonths(diffs[0], startDate);
@@ -2885,7 +2888,8 @@ public class WxRentContractServiceImpl implements WxRentContractService {
//销售收入不满足一年怎么算。
int yearDays = DateUtils.daysBetween(rentcontract.getYearsBegin(), rentcontract.getYearsEnd())+1;
if (yearDays == 365) {
//闰年是366
if (yearDays >= 365) {
}else {
if (rentcontract.getDayPriceCalcute().intValue() == EnumRentDayPriceCalcute.AVERAGE_DAYS.getCode()) {
jumpRevenuePay = jumpRevenuePay.multiply(new BigDecimal(yearDays)).divide(new BigDecimal(12*rentcontract.getMonthAverageDays()),rentcontract.getDecimalSize(),BigDecimal.ROUND_HALF_UP);


+ 2
- 0
mallinkService/src/main/java/com/iformall/utils/DateUtils.java Просмотреть файл

@@ -1169,8 +1169,10 @@ public class DateUtils {
bdate=sdf.parse(sdf.format(bdate));
Calendar cal = Calendar.getInstance();
cal.setTime(smdate);
cal.set(Calendar.MILLISECOND, 0);
long time1 = cal.getTimeInMillis();
cal.setTime(bdate);
cal.set(Calendar.MILLISECOND, 0);
long time2 = cal.getTimeInMillis();
long between_days=(time2-time1)/(1000*3600*24);
return Integer.parseInt(String.valueOf(between_days));


Загрузка…
Отмена
Сохранить