|
|
|
@@ -42,7 +42,6 @@ import java.net.URL; |
|
|
|
import java.text.DecimalFormat; |
|
|
|
import java.text.SimpleDateFormat; |
|
|
|
import java.util.*; |
|
|
|
import java.util.stream.Collectors; |
|
|
|
|
|
|
|
/** |
|
|
|
* @author gongbiao |
|
|
|
@@ -1083,7 +1082,7 @@ public class WxRentContractServiceImpl implements WxRentContractService { |
|
|
|
} |
|
|
|
|
|
|
|
wxBillRent.setNeedPay(needpay); |
|
|
|
wxBillRent.setOwe(0L); |
|
|
|
wxBillRent.setOwe(needpay); |
|
|
|
wxBillRent.setReceivePay(needpay); |
|
|
|
|
|
|
|
//截止收租日在当前时间之前 |
|
|
|
@@ -1091,7 +1090,6 @@ public class WxRentContractServiceImpl implements WxRentContractService { |
|
|
|
long day = (time.getTime() - date.getTime()) / (24 * 60 * 60 * 1000); |
|
|
|
wxBillRent.setStatus(EnumBillRentStatus.NOT_PAID.getCode()); |
|
|
|
wxBillRent.setExpiredDay(day); |
|
|
|
wxBillRent.setOwe(needpay); |
|
|
|
} else {//截止收租日在当前时间之后 |
|
|
|
Calendar now = Calendar.getInstance(); |
|
|
|
now.add(dayType, receivePeriod); |
|
|
|
|