Przeglądaj źródła

fix bug

release_toaliyun_real
lin 3 lat temu
rodzic
commit
1f7991642d
1 zmienionych plików z 5 dodań i 5 usunięć
  1. +5
    -5
      mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java

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

@@ -3261,12 +3261,12 @@ public class WxRentContractServiceImpl implements WxRentContractService {
int needPay = 0 ;
int months = DateUtils.monthsBetween(br.getStarttime(), br.getEndtime());
if ( months > 0 ) {
for (int i = 0 ; i < months ; i++ ) {
for (int i = 0 ; i <= months ; i++ ) {
int _money = 0;
if (i == 0 ) {
_money = sumTradeDailyBySameMonthDay(bq, wxRentContract.getMerchantId(), br.getStarttime(),
DateUtils.getLastDayForMonth(br.getStarttime()));
}else if (i == (months-1)){
}else if (i == months){
_money = sumTradeDailyBySameMonthDay(bq, wxRentContract.getMerchantId(),
DateUtils.getFirstDayForCurrMonth(DateUtils.getTimeAfterMonths(i,br.getStarttime())),
DateUtils.getDayEnd(DateUtils.getTimeAfterDays(-1, br.getEndtime())));
@@ -3282,7 +3282,7 @@ public class WxRentContractServiceImpl implements WxRentContractService {
//同一个月
//合同账单结束的时间是00:00:00,取日期要取前一天
needPay = sumTradeDailyBySameMonthDay(bq, wxRentContract.getMerchantId(),
br.getStarttime(), DateUtils.getTimeAfterDays(-1, br.getEndtime()));
br.getStarttime(), DateUtils.getDayEnd(DateUtils.getTimeAfterDays(-1, br.getEndtime())));
}
needPay = new BigDecimal(needPay).multiply(new BigDecimal(wxRentContract.getPayRatio()))
.divide(new BigDecimal(10000), 2, BigDecimal.ROUND_HALF_UP).intValue();
@@ -3323,8 +3323,8 @@ public class WxRentContractServiceImpl implements WxRentContractService {
return monthSums;
}else {
//根据天数计算
int monthDays = DateUtils.daysBetween(_fistDay, _lastDay);
int _days = DateUtils.daysBetween(begin, end);
int monthDays = DateUtils.daysBetween(_fistDay, _lastDay)+1;
int _days = DateUtils.daysBetween(begin, end)+1;
if (_days == 0) {
_days = 1;//当天
}


Ładowanie…
Anuluj
Zapisz