diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxBillPropertyServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxBillPropertyServiceImpl.java index b7981daa4..ee7b44c41 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxBillPropertyServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxBillPropertyServiceImpl.java @@ -166,6 +166,9 @@ public class WxBillPropertyServiceImpl implements WxBillPropertyService { property.setPayDate(record.getPayDate()); property.setUpdatetime(date); property.setPayWay(record.getPayWay()); + if(record.getLatePayPriceStr() != null) { + property.setLatePayPrice(Long.parseLong(record.getLatePayPriceStr()) * 100); + } try { wxBillPropertyMapper.updateByPrimaryKeySelective(property); } catch (Exception e) { diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxBillRentServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxBillRentServiceImpl.java index 76953adc6..c706798d1 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxBillRentServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxBillRentServiceImpl.java @@ -165,6 +165,10 @@ public class WxBillRentServiceImpl implements WxBillRentService { wxBillRent.setPayDate(record.getPayDate()); wxBillRent.setUpdatetime(date); wxBillRent.setPayWay(record.getPayWay()); + + if(record.getLatePayPriceStr() != null) { + wxBillRent.setLatePayPrice(Long.parseLong(record.getLatePayPriceStr()) * 100); + } try { wxBillRentMapper.updateByPrimaryKeySelective(wxBillRent); } catch (Exception e) { diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxPropertyContractServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxPropertyContractServiceImpl.java index 7d07271e5..e042519d4 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxPropertyContractServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxPropertyContractServiceImpl.java @@ -724,9 +724,10 @@ public class WxPropertyContractServiceImpl implements WxPropertyContractService priceD = new Double(price)/12; } + SimpleDateFormat sdMR = new SimpleDateFormat("MM-dd"); SimpleDateFormat sdM = new SimpleDateFormat("yyyy-MM"); 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"); months++; needpay = new Double(months * priceD).longValue(); diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java index e903092f0..a9201fa2e 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java @@ -1119,9 +1119,10 @@ public class WxRentContractServiceImpl implements WxRentContractService { priceD = new Double(price)/12; } + SimpleDateFormat sdMR = new SimpleDateFormat("MM-dd"); SimpleDateFormat sdM = new SimpleDateFormat("yyyy-MM"); 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"); months++; needpay = new Double(months * priceD).longValue();