|
|
|
@@ -358,7 +358,7 @@ public class WxPropertyContractServiceImpl implements WxPropertyContractService |
|
|
|
//建立账单 |
|
|
|
WxPropertyContract record = wxPropertyContractMapper.selectByPrimaryKey(id); |
|
|
|
if (record.getMerchantId() != null && record.getStatus().equals(EnumRentContractStatus.SIGNED_RENT_UNPAID.getCode()) |
|
|
|
&& record.getReceivePeriod() != null && record.getDeposit() > 0 && record.getPrice() > 0) { |
|
|
|
&& record.getReceivePeriod() != null && record.getPrice() > 0) { |
|
|
|
//WxBillProperty wxBillProperty = new WxBillProperty(); |
|
|
|
//wxBillProperty.setMerchantId(record.getMerchantId()); |
|
|
|
//List<Map<String, Object>> billPropertyList = wxBillPropertyMapper.queryBillPropertyList(wxBillProperty); |
|
|
|
@@ -560,20 +560,24 @@ public class WxPropertyContractServiceImpl implements WxPropertyContractService |
|
|
|
priceD = new Double(price)/12; |
|
|
|
} |
|
|
|
|
|
|
|
SimpleDateFormat sdM = new SimpleDateFormat("yyyy-MM"); |
|
|
|
if(i == 0){//第一期 |
|
|
|
if(wxPropertyContract.getAdjustPeriod().equals(EnumRentContractAdjustPeriod.ADJUST_PERIOD_NAR_MONTH.getCode())){ |
|
|
|
if(isFirstDay(billTimeVo.getStartDate())){ |
|
|
|
needpay = new Double(receivePeriod * priceD).longValue(); |
|
|
|
int months = WxRentContractServiceImpl.getMonths(sdM.format(billTimeVo.getStartDate())+"-01",sdM.format(billTimeVo.getEndDate())+"-01"); |
|
|
|
needpay = new Double(months * priceD).longValue(); |
|
|
|
}else{ |
|
|
|
needpay = new Double(WxRentContractServiceImpl.getMonthNeedPay(priceD, billTimeVo.getStartDate(), billTimeVo.getEndDate())).longValue(); |
|
|
|
} |
|
|
|
}else{ |
|
|
|
needpay = new Double(receivePeriod * priceD).longValue(); |
|
|
|
int months = WxRentContractServiceImpl.getMonths(sdM.format(billTimeVo.getStartDate())+"-01",sdM.format(billTimeVo.getEndDate())+"-01"); |
|
|
|
needpay = new Double(months * priceD).longValue(); |
|
|
|
} |
|
|
|
}else if(i == billTimeVoList.size()-1){//最后 |
|
|
|
needpay = new Double(WxRentContractServiceImpl.getMonthNeedPay(priceD,billTimeVo.getStartDate(),billTimeVo.getEndDate())).longValue(); |
|
|
|
}else{//中间 |
|
|
|
needpay = new Double(receivePeriod * priceD).longValue(); |
|
|
|
int months = WxRentContractServiceImpl.getMonths(sdM.format(billTimeVo.getStartDate())+"-01",sdM.format(billTimeVo.getEndDate())+"-01"); |
|
|
|
needpay = new Double(months * priceD).longValue(); |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|