|
|
|
@@ -271,7 +271,7 @@ public class WxPropertyContractServiceImpl implements WxPropertyContractService |
|
|
|
if (list.size() > 0) { |
|
|
|
wxPropertyContract = list.get(0); |
|
|
|
//找到计租方式 |
|
|
|
int dayType = wxPropertyContract.getAdjustPeriod().equals(EnumRentContractAdjustPeriod.ADJUST_PERIOD_MONTH.getCode()) ? Calendar.DAY_OF_MONTH : Calendar.MONTH; |
|
|
|
int dayType = wxPropertyContract.getAdjustPeriod().equals(EnumRentContractAdjustPeriod.ADJUST_PERIOD_DAY.getCode()) ? Calendar.DAY_OF_MONTH : Calendar.MONTH; |
|
|
|
final IdWorker idWorker = IdWorker.get(); |
|
|
|
WxBillPropertyDeposit wxBillDeposit = new WxBillPropertyDeposit(); |
|
|
|
wxBillDeposit.setId(idWorker.nextId()); |
|
|
|
@@ -331,7 +331,7 @@ public class WxPropertyContractServiceImpl implements WxPropertyContractService |
|
|
|
List<WxPropertyContract> list = wxPropertyContractMapper.findList(wxPropertyContract); |
|
|
|
if (list.size() > 0) { |
|
|
|
wxPropertyContract = list.get(0); |
|
|
|
int dayType = wxPropertyContract.getAdjustPeriod().equals(EnumRentContractAdjustPeriod.ADJUST_PERIOD_MONTH.getCode()) ? Calendar.MONTH : Calendar.DAY_OF_MONTH; |
|
|
|
int dayType = wxPropertyContract.getAdjustPeriod().equals(EnumRentContractAdjustPeriod.ADJUST_PERIOD_DAY.getCode()) ? Calendar.DAY_OF_MONTH : Calendar.MONTH; |
|
|
|
int receivePeriod = wxPropertyContract.getReceivePeriod().intValue(); |
|
|
|
Integer lease = wxPropertyContract.getLease(); |
|
|
|
int extralease = lease % receivePeriod; |
|
|
|
|