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

Merge commit 'd60c3345206749d7fb07d8f96f8ce60a200b5e55' into release

release_toaliyun_real
luozukai 6 лет назад
Родитель
Сommit
f82570c96f
2 измененных файлов: 18 добавлений и 3 удалений
  1. +15
    -0
      mallinkService/src/main/java/com/iformall/service/impl/WxBillAllServiceImpl.java
  2. +3
    -3
      mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java

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

@@ -1047,6 +1047,9 @@ public class WxBillAllServiceImpl implements WxBillAllService {
if (payDate.after(receiveDate)) { if (payDate.after(receiveDate)) {
int expiredDay = DateUtils.daysBetween(receiveDate, payDate); int expiredDay = DateUtils.daysBetween(receiveDate, payDate);
daily.setExpiredDay((long) expiredDay); daily.setExpiredDay((long) expiredDay);
daily.setStatus(EnumBillRentStatus.NOT_PAID.getCode());
} else {
daily.setStatus(EnumBillRentStatus.WAIT_PAY.getCode());
} }
} }
daily.setReceivePay(receivePay); daily.setReceivePay(receivePay);
@@ -1125,6 +1128,9 @@ public class WxBillAllServiceImpl implements WxBillAllService {
if (payDate.after(receiveDate)) { if (payDate.after(receiveDate)) {
int expiredDay = DateUtils.daysBetween(receiveDate, payDate); int expiredDay = DateUtils.daysBetween(receiveDate, payDate);
other.setExpiredDay((long) expiredDay); other.setExpiredDay((long) expiredDay);
other.setStatus(EnumBillRentStatus.NOT_PAID.getCode());
} else {
other.setStatus(EnumBillRentStatus.WAIT_PAY.getCode());
} }
} }
other.setReceivePay(receivePay); other.setReceivePay(receivePay);
@@ -1206,6 +1212,9 @@ public class WxBillAllServiceImpl implements WxBillAllService {
if (payDate.after(receiveDate)) { if (payDate.after(receiveDate)) {
int expiredDay = DateUtils.daysBetween(receiveDate, payDate); int expiredDay = DateUtils.daysBetween(receiveDate, payDate);
otherDeposit.setExpiredDay((long) expiredDay); otherDeposit.setExpiredDay((long) expiredDay);
otherDeposit.setStatus(EnumBillRentStatus.NOT_PAID.getCode());
} else {
otherDeposit.setStatus(EnumBillRentStatus.WAIT_PAY.getCode());
} }
} }
otherDeposit.setReceivePay(receivePay); otherDeposit.setReceivePay(receivePay);
@@ -1300,6 +1309,9 @@ public class WxBillAllServiceImpl implements WxBillAllService {
if (payDate.after(receiveDate)) { if (payDate.after(receiveDate)) {
int expiredDay = DateUtils.daysBetween(receiveDate, payDate); int expiredDay = DateUtils.daysBetween(receiveDate, payDate);
rent.setExpiredDay((long) expiredDay); rent.setExpiredDay((long) expiredDay);
rent.setStatus(EnumBillRentStatus.NOT_PAID.getCode());
} else {
rent.setStatus(EnumBillRentStatus.WAIT_PAY.getCode());
} }
} }
rent.setPay(rent.getPay() + pay); rent.setPay(rent.getPay() + pay);
@@ -1333,6 +1345,9 @@ public class WxBillAllServiceImpl implements WxBillAllService {
if (payDate.after(receiveDate)) { if (payDate.after(receiveDate)) {
int expiredDay = DateUtils.daysBetween(receiveDate, payDate); int expiredDay = DateUtils.daysBetween(receiveDate, payDate);
property.setExpiredDay((long) expiredDay); property.setExpiredDay((long) expiredDay);
property.setStatus(EnumBillRentStatus.NOT_PAID.getCode());
} else {
property.setStatus(EnumBillRentStatus.WAIT_PAY.getCode());
} }
} }
property.setPay(property.getPay() + pay); property.setPay(property.getPay() + pay);


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

@@ -2066,7 +2066,7 @@ 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]+1) * (price/dayCount);
total += (diff[1]) * (price/dayCount);
return total; return total;
} }


@@ -2126,12 +2126,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] +1);
total += price * (diff[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] +1);
total += price * (diff[1]);
} }


//预警 //预警


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