|
|
|
@@ -544,20 +544,22 @@ public class WxPropertyContractServiceImpl implements WxPropertyContractService |
|
|
|
wxBillDeposit.setReceivePay(needpay); |
|
|
|
//wxBillDeposit.setOwe(needpay); |
|
|
|
Date date = new Date(); |
|
|
|
Calendar instance = Calendar.getInstance(); |
|
|
|
instance.setTime(wxPropertyContract.getRentalStartDate()); |
|
|
|
instance.add(Calendar.DAY_OF_MONTH, -1); |
|
|
|
Date time = instance.getTime(); |
|
|
|
//账单开始时间 |
|
|
|
instance.clear(); |
|
|
|
instance.setTime(time); |
|
|
|
instance.add(Calendar.DAY_OF_MONTH, 1); |
|
|
|
wxBillDeposit.setStarttime(instance.getTime()); |
|
|
|
//账单结束时间 |
|
|
|
instance.clear(); |
|
|
|
instance.setTime(time); |
|
|
|
instance.add(dayType, wxPropertyContract.getLease()); |
|
|
|
wxBillDeposit.setEndtime(instance.getTime()); |
|
|
|
// Calendar instance = Calendar.getInstance(); |
|
|
|
// instance.setTime(wxPropertyContract.getRentalStartDate()); |
|
|
|
// instance.add(Calendar.DAY_OF_MONTH, -1); |
|
|
|
// Date time = instance.getTime(); |
|
|
|
// //账单开始时间 |
|
|
|
// instance.clear(); |
|
|
|
// instance.setTime(time); |
|
|
|
// instance.add(Calendar.DAY_OF_MONTH, 1); |
|
|
|
// wxBillDeposit.setStarttime(instance.getTime()); |
|
|
|
wxBillDeposit.setStarttime(record.getFirstBillDateStart()); |
|
|
|
// //账单结束时间 |
|
|
|
// instance.clear(); |
|
|
|
// instance.setTime(time); |
|
|
|
// instance.add(dayType, wxPropertyContract.getLease()); |
|
|
|
// wxBillDeposit.setEndtime(instance.getTime()); |
|
|
|
wxBillDeposit.setEndtime(record.getFirstBillDateEnd()); |
|
|
|
wxBillDeposit.setStatus(EnumBillStatus.WAIT_PAY.getCode()); |
|
|
|
wxBillDeposit.updateTenantInfo(wxPropertyContract); |
|
|
|
wxBillDeposit.setMerchantId(record.getMerchantId()); |
|
|
|
|