| @@ -166,6 +166,9 @@ public class WxBillPropertyServiceImpl implements WxBillPropertyService { | |||||
| property.setPayDate(record.getPayDate()); | property.setPayDate(record.getPayDate()); | ||||
| property.setUpdatetime(date); | property.setUpdatetime(date); | ||||
| property.setPayWay(record.getPayWay()); | property.setPayWay(record.getPayWay()); | ||||
| if(record.getLatePayPriceStr() != null) { | |||||
| property.setLatePayPrice(Long.parseLong(record.getLatePayPriceStr()) * 100); | |||||
| } | |||||
| try { | try { | ||||
| wxBillPropertyMapper.updateByPrimaryKeySelective(property); | wxBillPropertyMapper.updateByPrimaryKeySelective(property); | ||||
| } catch (Exception e) { | } catch (Exception e) { | ||||
| @@ -165,6 +165,10 @@ public class WxBillRentServiceImpl implements WxBillRentService { | |||||
| wxBillRent.setPayDate(record.getPayDate()); | wxBillRent.setPayDate(record.getPayDate()); | ||||
| wxBillRent.setUpdatetime(date); | wxBillRent.setUpdatetime(date); | ||||
| wxBillRent.setPayWay(record.getPayWay()); | wxBillRent.setPayWay(record.getPayWay()); | ||||
| if(record.getLatePayPriceStr() != null) { | |||||
| wxBillRent.setLatePayPrice(Long.parseLong(record.getLatePayPriceStr()) * 100); | |||||
| } | |||||
| try { | try { | ||||
| wxBillRentMapper.updateByPrimaryKeySelective(wxBillRent); | wxBillRentMapper.updateByPrimaryKeySelective(wxBillRent); | ||||
| } catch (Exception e) { | } catch (Exception e) { | ||||
| @@ -724,9 +724,10 @@ public class WxPropertyContractServiceImpl implements WxPropertyContractService | |||||
| priceD = new Double(price)/12; | priceD = new Double(price)/12; | ||||
| } | } | ||||
| SimpleDateFormat sdMR = new SimpleDateFormat("MM-dd"); | |||||
| SimpleDateFormat sdM = new SimpleDateFormat("yyyy-MM"); | SimpleDateFormat sdM = new SimpleDateFormat("yyyy-MM"); | ||||
| if(i == billTimeVoListSize - 1){//最后 | if(i == billTimeVoListSize - 1){//最后 | ||||
| if(isFirstDay(startDate)){ | |||||
| if(sdMR.format(startDate).equals(sdMR.format(wxRentContract.getStartDate())) && sdMR.format(endDate).equals(sdMR.format(wxRentContract.getEndDate())) ){ | |||||
| int months = WxRentContractServiceImpl.getMonths(sdM.format(startDate)+"-01",sdM.format(endDate)+"-01"); | int months = WxRentContractServiceImpl.getMonths(sdM.format(startDate)+"-01",sdM.format(endDate)+"-01"); | ||||
| months++; | months++; | ||||
| needpay = new Double(months * priceD).longValue(); | needpay = new Double(months * priceD).longValue(); | ||||
| @@ -1119,9 +1119,10 @@ public class WxRentContractServiceImpl implements WxRentContractService { | |||||
| priceD = new Double(price)/12; | priceD = new Double(price)/12; | ||||
| } | } | ||||
| SimpleDateFormat sdMR = new SimpleDateFormat("MM-dd"); | |||||
| SimpleDateFormat sdM = new SimpleDateFormat("yyyy-MM"); | SimpleDateFormat sdM = new SimpleDateFormat("yyyy-MM"); | ||||
| if(i == billTimeVoListSize - 1){//最后 | if(i == billTimeVoListSize - 1){//最后 | ||||
| if(isFirstDay(startDate)){ | |||||
| if(sdMR.format(startDate).equals(sdMR.format(wxRentContract.getStartDate())) && sdMR.format(endDate).equals(sdMR.format(wxRentContract.getEndDate())) ){ | |||||
| int months = getMonths(sdM.format(startDate)+"-01",sdM.format(endDate)+"-01"); | int months = getMonths(sdM.format(startDate)+"-01",sdM.format(endDate)+"-01"); | ||||
| months++; | months++; | ||||
| needpay = new Double(months * priceD).longValue(); | needpay = new Double(months * priceD).longValue(); | ||||