|
|
@@ -674,7 +674,7 @@ public class WxPropertyContractServiceImpl implements WxPropertyContractService |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
wxBillProperty.setNeedPay(needpay); |
|
|
wxBillProperty.setNeedPay(needpay); |
|
|
wxBillProperty.setOwe(needpay); |
|
|
|
|
|
|
|
|
wxBillProperty.setOwe(0L); |
|
|
wxBillProperty.setReceivePay(needpay); |
|
|
wxBillProperty.setReceivePay(needpay); |
|
|
|
|
|
|
|
|
//截止收租日在当前时间之前 |
|
|
//截止收租日在当前时间之前 |
|
|
@@ -682,6 +682,7 @@ public class WxPropertyContractServiceImpl implements WxPropertyContractService |
|
|
long day = (time.getTime() - date.getTime()) / (24 * 60 * 60 * 1000); |
|
|
long day = (time.getTime() - date.getTime()) / (24 * 60 * 60 * 1000); |
|
|
wxBillProperty.setStatus(EnumBillRentStatus.NOT_PAID.getCode()); |
|
|
wxBillProperty.setStatus(EnumBillRentStatus.NOT_PAID.getCode()); |
|
|
wxBillProperty.setExpiredDay(day); |
|
|
wxBillProperty.setExpiredDay(day); |
|
|
|
|
|
wxBillProperty.setOwe(needpay); |
|
|
} else {//截止收租日在当前时间之后 |
|
|
} else {//截止收租日在当前时间之后 |
|
|
Calendar now = Calendar.getInstance(); |
|
|
Calendar now = Calendar.getInstance(); |
|
|
now.add(dayType, receivePeriod); |
|
|
now.add(dayType, receivePeriod); |
|
|
@@ -695,7 +696,7 @@ public class WxPropertyContractServiceImpl implements WxPropertyContractService |
|
|
wxBillProperty.setExpiredDay(0L); |
|
|
wxBillProperty.setExpiredDay(0L); |
|
|
} |
|
|
} |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
wxBillProperty.setRevenue(0L); |
|
|
wxBillProperty.setTenantId(wxMerchant.getTenantId()); |
|
|
wxBillProperty.setTenantId(wxMerchant.getTenantId()); |
|
|
wxBillProperty.setIsDel(0); |
|
|
wxBillProperty.setIsDel(0); |
|
|
wxBillProperty.setMerchantId(wxMerchant.getId()); |
|
|
wxBillProperty.setMerchantId(wxMerchant.getId()); |
|
|
|