Przeglądaj źródła

fix

release_toaliyun_real
winter 1 rok temu
rodzic
commit
b4709bd2eb
2 zmienionych plików z 3 dodań i 18 usunięć
  1. +1
    -15
      mallinkService/src/main/java/com/iformall/service/helper/WxRentContractHelper.java
  2. +2
    -3
      mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java

+ 1
- 15
mallinkService/src/main/java/com/iformall/service/helper/WxRentContractHelper.java Wyświetl plik

@@ -795,21 +795,7 @@ public class WxRentContractHelper {
// freeDays.add(d6);
// freeDays.add(d7);
Date d11 = DateUtils.str2Date("2024-08-20 00:00:00").getTime();
Date d21 = DateUtils.str2Date("2024-09-19 00:00:00").getTime();
List<Date> frees1 = DateUtils.getAllDays(d11, d21);
freeDays.addAll(frees1);
Date d111 = DateUtils.str2Date("2024-10-01 00:00:00").getTime();
Date d211 = DateUtils.str2Date("2024-10-31 00:00:00").getTime();
List<Date> frees2 = DateUtils.getAllDays(d111, d211);
freeDays.addAll(frees2);
Date d11111 = DateUtils.str2Date("2024-09-07 00:00:00").getTime();
Date d21111 = DateUtils.str2Date("2024-10-06 00:00:00").getTime();
List<Date> dds = getValidDays(d11111,d21111,freeDays);
System.out.println(dds.size());
System.out.println(DateUtils.getDaySet(d1, Calendar.DATE, -1));
//String dayMoney = getNeedPay(freeDays, 2, new BigDecimal(10), start, end, EnumRentDayPriceCalcute.AVERAGE_DAYS, 30);
//System.out.println(dayMoney);


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

@@ -1310,7 +1310,7 @@ public class WxRentContractServiceImpl implements WxRentContractService {
if (billTimeVo.getEndDate().equals(yeardateEnd) || billTimeVo.getEndDate().before(yeardateEnd)) {
isNeddCut = false;
}else {
currentEnd = yeardateEnd;
currentEnd = DateUtils.getDaySet(yeardateEnd, Calendar.DATE, -1);
}
needpayFront = WxRentContractHelper.getNeedPayMoney(freePeriods,wxRentContract, priceArrs[index - 1], billTimeVo.getStartDate(), currentEnd, i, billTimeVoList.size(), saveDb, dayType, receivePeriod);
if (isNeddCut) {
@@ -1927,13 +1927,12 @@ public class WxRentContractServiceImpl implements WxRentContractService {
//如果开始时间到了年的截止
if (timeVo.getStartDate().equals(yearEndDateStart)) {
yearsEndList.remove(yearEndDateStart);
//TODO 是不是有1天?
}else if (timeVo.getStartDate().after(yearEndDateStart)) {
//do nothing
}else if (timeVo.getStartDate().before(yearEndDateStart)) {
Date yearEndDateEnd = DateUtils.getDayEnd(yearEndDateStart);
if (timeVo.getEndDate().after(yearEndDateEnd)) {
timeVo.setEndDate(yearEndDateEnd);
timeVo.setEndDate(DateUtils.getDaySet(yearEndDateEnd,Calendar.DATE,-1));
yearsEndList.remove(yearEndDateStart);
isYearCut = true;
}else if(timeVo.getEndDate().equals(yearEndDateEnd)) {


Ładowanie…
Anuluj
Zapisz