Przeglądaj źródła

Merge commit '31e1c4fc5b605581fc97f713826f5c749a0d787a' into release

release_toaliyun_real
luozukai 7 lat temu
rodzic
commit
93e1d7260f
2 zmienionych plików z 2 dodań i 3 usunięć
  1. +1
    -2
      mallinkService/src/main/java/com/iformall/service/impl/WxPropertyContractServiceImpl.java
  2. +1
    -1
      mallinkService/src/main/java/com/iformall/utils/DateUtils.java

+ 1
- 2
mallinkService/src/main/java/com/iformall/service/impl/WxPropertyContractServiceImpl.java Wyświetl plik

@@ -722,8 +722,7 @@ public class WxPropertyContractServiceImpl implements WxPropertyContractService
int receivePeriod = wxPropertyContract.getReceivePeriod().intValue();
Integer lease = wxPropertyContract.getLease();
Date rentalStartDate = wxPropertyContract.getRentalStartDate();
System.out.println(wxPropertyContract.getRentStartType().intValue() + "------------------");
if (wxPropertyContract.getRentStartType().equals(EnumRentStartType.STARTTIME.getCode())) {
if (EnumRentStartType.STARTTIME.getCode().equals(wxPropertyContract.getRentStartType())) {
rentalStartDate = wxPropertyContract.getStartDate();
}
propertyContract.setRentalStartDate(rentalStartDate);


+ 1
- 1
mallinkService/src/main/java/com/iformall/utils/DateUtils.java Wyświetl plik

@@ -1105,7 +1105,7 @@ public class DateUtils {
LocalDate end = localDateTime.toLocalDate();

if (!start.isBefore(end)) {
throw new IllegalArgumentException("Start must not be before end.");
throw new IllegalArgumentException("日期不正确,请检查。");
}

Period period = Period.between(start, end);


Ładowanie…
Anuluj
Zapisz