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 ba5a87e47..a6187c04b 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java @@ -781,6 +781,14 @@ public class WxRentContractServiceImpl implements WxRentContractService { return resultList; } + public boolean isFirstDay(Date date){ + int dateInt = Integer.parseInt(new SimpleDateFormat("d").format(date)); + if(dateInt == 1){ + return true; + } + return false; + } + public Map buildRent(int lease, int receivePeriod, int price, Date startdate, int dayType, WxRentContract wxRentContract, Long userId, WxMerchant wxMerchant, int billcount, Integer isPreview, Map shopInfo) { String shopInfoStr = null; if (shopInfo != null) { @@ -794,7 +802,9 @@ public class WxRentContractServiceImpl implements WxRentContractService { int index = paycount - 1; final IdWorker idWorker = IdWorker.get(); //自然月 n+1 - if(wxRentContract.getAdjustPeriod().equals(EnumRentContractAdjustPeriod.ADJUST_PERIOD_NAR_MONTH.getCode())){ + if(wxRentContract.getAdjustPeriod().equals(EnumRentContractAdjustPeriod.ADJUST_PERIOD_NAR_MONTH.getCode()) + && !isFirstDay(wxRentContract.getRentalStartDate()) + ){ paycount ++; } for (int i = 0; i < paycount; i++) {