winter 1 год назад
Родитель
Сommit
807388c8f1
1 измененных файлов: 8 добавлений и 8 удалений
  1. +8
    -8
      mallinkService/src/main/java/com/iformall/service/helper/WxRentContractHelper.java

+ 8
- 8
mallinkService/src/main/java/com/iformall/service/helper/WxRentContractHelper.java Просмотреть файл

@@ -451,7 +451,7 @@ public class WxRentContractHelper {
//同一天 //同一天
if(sd.format(start).equals(sd.format(end))){ if(sd.format(start).equals(sd.format(end))){
List<Date> validDays = getValidDays(start,end,freeDays); List<Date> validDays = getValidDays(start,end,freeDays);
if (validDays.size() <= 0 ) {
if (null == validDays || validDays.size() <= 0 ) {
return "0"; return "0";
} }
if (validDays.contains(start)) { if (validDays.contains(start)) {
@@ -465,7 +465,7 @@ public class WxRentContractHelper {
//同月 //同月
if(sdM.format(start).equals(sdM.format(end))){ if(sdM.format(start).equals(sdM.format(end))){
List<Date> validDays = getValidDays(start,end,freeDays); List<Date> validDays = getValidDays(start,end,freeDays);
if (validDays.size() <= 0 ) {
if (null == validDays || validDays.size() <= 0 ) {
return "0"; return "0";
} }
NeedPayDTO np = getMonthPay(start, end, price, decimalSize, validDays, dayPriceCalcute, monthAvageDays); NeedPayDTO np = getMonthPay(start, end, price, decimalSize, validDays, dayPriceCalcute, monthAvageDays);
@@ -477,7 +477,7 @@ public class WxRentContractHelper {
instance = EnumContractReceivePeriodUnit.getAfterCalendarDay(instance, receivePeriod, dayType); instance = EnumContractReceivePeriodUnit.getAfterCalendarDay(instance, receivePeriod, dayType);
if(sd.format(instance.getTime()).equals(sd.format(end))){ if(sd.format(instance.getTime()).equals(sd.format(end))){
List<Date> validDays = getValidDays(start,end,freeDays); List<Date> validDays = getValidDays(start,end,freeDays);
if (validDays.size() <= 0 ) {
if (null == validDays || validDays.size() <= 0 ) {
return "0"; return "0";
} }
//不是一个月的。但是按整月算的 //不是一个月的。但是按整月算的
@@ -494,7 +494,7 @@ public class WxRentContractHelper {
//开始到这个月底 //开始到这个月底
Date lastMonthDay = DateUtils.getLastDayForMonth(start); Date lastMonthDay = DateUtils.getLastDayForMonth(start);
List<Date> currValidDays = getValidDays(start,lastMonthDay,freeDays); List<Date> currValidDays = getValidDays(start,lastMonthDay,freeDays);
if (currValidDays.size() <= 0 ) {
if (null == currValidDays || currValidDays.size() <= 0 ) {
return "0"; return "0";
} }
NeedPayDTO np = getMonthPay(start, lastMonthDay, price, decimalSize, currValidDays, dayPriceCalcute, monthAvageDays); NeedPayDTO np = getMonthPay(start, lastMonthDay, price, decimalSize, currValidDays, dayPriceCalcute, monthAvageDays);
@@ -507,7 +507,7 @@ public class WxRentContractHelper {
for (int i = 0 ; i < months; i++) { for (int i = 0 ; i < months; i++) {
Date currentMonthEnd = DateUtils.getLastDayForMonth(newStartDate); Date currentMonthEnd = DateUtils.getLastDayForMonth(newStartDate);
List<Date> _validDays = getValidDays(newStartDate,currentMonthEnd,freeDays); List<Date> _validDays = getValidDays(newStartDate,currentMonthEnd,freeDays);
if (_validDays.size() <= 0 ) {
if (null == _validDays ||_validDays.size() <= 0 ) {
}else { }else {
NeedPayDTO _np = getMonthPay(newStartDate, currentMonthEnd, price, decimalSize, _validDays, dayPriceCalcute, monthAvageDays); NeedPayDTO _np = getMonthPay(newStartDate, currentMonthEnd, price, decimalSize, _validDays, dayPriceCalcute, monthAvageDays);
System.out.println(i+2+"月>>>>"+DateUtils.date2String(newStartDate)+">>>>"+DateUtils.date2String(currentMonthEnd)+">>>>"+_np.getMoney().toPlainString()); System.out.println(i+2+"月>>>>"+DateUtils.date2String(newStartDate)+">>>>"+DateUtils.date2String(currentMonthEnd)+">>>>"+_np.getMoney().toPlainString());
@@ -520,7 +520,7 @@ public class WxRentContractHelper {
if (newStartDate.before(end)) { if (newStartDate.before(end)) {
Date last = DateUtils.getFirstDayForCurrMonth(end); Date last = DateUtils.getFirstDayForCurrMonth(end);
List<Date> lastValidDays = getValidDays(last,end,freeDays); List<Date> lastValidDays = getValidDays(last,end,freeDays);
if (lastValidDays.size() <= 0 ) {
if (null == lastValidDays || lastValidDays.size() <= 0 ) {
return "0"; return "0";
} }
NeedPayDTO enp = getMonthPay(last, end, price, decimalSize, lastValidDays, dayPriceCalcute, monthAvageDays); NeedPayDTO enp = getMonthPay(last, end, price, decimalSize, lastValidDays, dayPriceCalcute, monthAvageDays);
@@ -758,8 +758,8 @@ public class WxRentContractHelper {
//String dayMoney = getNeedPay(freeDays, 2, new BigDecimal(10), start, end, EnumRentDayPriceCalcute.AVERAGE_DAYS, 30); //String dayMoney = getNeedPay(freeDays, 2, new BigDecimal(10), start, end, EnumRentDayPriceCalcute.AVERAGE_DAYS, 30);
//System.out.println(dayMoney); //System.out.println(dayMoney);
String monthMoney = getMonthNeedPay(freeDays, 2, new BigDecimal(2000), start, end, EnumContractReceivePeriodUnit.QUARTER.getCode(), 1, EnumRentDayPriceCalcute.AVERAGE_DAYS.getCode(), 30);
System.out.println(monthMoney);
//String monthMoney = getMonthNeedPay(freeDays, 2, new BigDecimal(2000), start, end, EnumContractReceivePeriodUnit.QUARTER.getCode(), 1, EnumRentDayPriceCalcute.AVERAGE_DAYS.getCode(), 30);
//System.out.println(monthMoney);
} }




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