Просмотр исходного кода

Merge commit '5d1b71cbc99b632b170d2e0de469344ba07c3303' into release

release_toaliyun_real
luozukai 6 лет назад
Родитель
Сommit
0a9c8e5a93
2 измененных файлов: 12 добавлений и 14 удалений
  1. +11
    -13
      mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java
  2. +1
    -1
      mallinkService/src/main/java/com/iformall/utils/DateUtils.java

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

@@ -1141,7 +1141,10 @@ public class WxRentContractServiceImpl implements WxRentContractService {
SimpleDateFormat sdD = new SimpleDateFormat("d"); SimpleDateFormat sdD = new SimpleDateFormat("d");
SimpleDateFormat sd = new SimpleDateFormat("yyyy-MM-dd"); SimpleDateFormat sd = new SimpleDateFormat("yyyy-MM-dd");
// System.out.println(sd.format(startDate)); // System.out.println(sd.format(startDate));
// System.out.println(sd.format(endDate));
System.out.println(sd.format(endDate));
if(sd.format(endDate).equals("2020-08-18")){
System.out.println();
}


if(i == billTimeVoListSize - 1){//最后 if(i == billTimeVoListSize - 1){//最后
//判断是否满足整月 //判断是否满足整月
@@ -2027,6 +2030,9 @@ public class WxRentContractServiceImpl implements WxRentContractService {


System.out.println(sd.format(start)); System.out.println(sd.format(start));
System.out.println(sd.format(end)); System.out.println(sd.format(end));
if(sd.format(end).equals("2020-08-18")){
System.out.println();
}


//同一天 //同一天
if(sd.format(start).equals(sd.format(end))){ if(sd.format(start).equals(sd.format(end))){
@@ -2066,18 +2072,10 @@ public class WxRentContractServiceImpl implements WxRentContractService {
//最后一个月 //最后一个月
diff = DateUtils.getDiff(DateUtils.getFirstDayForCurrMonth(end),end); diff = DateUtils.getDiff(DateUtils.getFirstDayForCurrMonth(end),end);
dayCount = DateUtils.getMonthDayCount(end); dayCount = DateUtils.getMonthDayCount(end);
total += (diff[1]) * (price/dayCount);
total += (diff[1]+1) * (price/dayCount);
return total; return total;
} }


public static void main(String[] args) throws Exception{
SimpleDateFormat sd = new SimpleDateFormat("yyyy-MM-dd");
int[] a= DateUtils.getDiff(sd.parse("2020-11-01"),sd.parse("2021-04-30"));
System.out.println(a[0]);
System.out.println(a[1]);
}


/** /**
* 按日计租 根据每月的日期总数计算needpay * 按日计租 根据每月的日期总数计算needpay
* @param monthPrice * @param monthPrice
@@ -2126,12 +2124,12 @@ public class WxRentContractServiceImpl implements WxRentContractService {
//最后一个月 //最后一个月
if(sdM.format(monthStartDate).equals(sdM.format(end))){ if(sdM.format(monthStartDate).equals(sdM.format(end))){
diff = DateUtils.getDiff(monthStartDate,end); diff = DateUtils.getDiff(monthStartDate,end);
total += price * (diff[1]);
total += price * (diff[1]+1);
break; break;
}else{ }else{
currEnd = DateUtils.getLastDayForMonth(monthStartDate); currEnd = DateUtils.getLastDayForMonth(monthStartDate);
diff = DateUtils.getDiff(monthStartDate,currEnd); diff = DateUtils.getDiff(monthStartDate,currEnd);
total += price * (diff[1]);
total += price * (diff[1]+1);
} }


//预警 //预警
@@ -2242,4 +2240,4 @@ public class WxRentContractServiceImpl implements WxRentContractService {
public WxRentContract getByBill(WxBillRent billRent) { public WxRentContract getByBill(WxBillRent billRent) {
return wxRentContractMapper.getByBill(billRent); return wxRentContractMapper.getByBill(billRent);
} }
}
}

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

@@ -1135,7 +1135,7 @@ public class DateUtils {
public static int[] getDiff(Date startDate,Date endDate) { public static int[] getDiff(Date startDate,Date endDate) {
SimpleDateFormat sd = new SimpleDateFormat("yyyy-MM-dd"); SimpleDateFormat sd = new SimpleDateFormat("yyyy-MM-dd");
if(sd.format(startDate).equals(sd.format(endDate))){ if(sd.format(startDate).equals(sd.format(endDate))){
return new int[] {0, 1};
return new int[] {0, 0};
} }


ZoneId zone = ZoneId.systemDefault(); ZoneId zone = ZoneId.systemDefault();


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