|
|
|
@@ -1000,6 +1000,7 @@ public class WxRentContractServiceImpl implements WxRentContractService { |
|
|
|
return shopInfoStr; |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
public Map<String, Object> buildRent(int receivePeriod, long[] priceArrs, List<Date> yearList, int dayType, WxRentContract wxRentContract, Long userId, int billcount, Integer isPreview, String shopInfoStr,boolean saveDb) { |
|
|
|
SimpleDateFormat sd = new SimpleDateFormat("yyyy-MM-dd"); |
|
|
|
Map<String,Object> resultMap = new HashedMap(); |
|
|
|
@@ -1050,8 +1051,12 @@ public class WxRentContractServiceImpl implements WxRentContractService { |
|
|
|
if(sd.format(billTimeVo.getStartDate()).equals(sd.format(billTimeVo.getEndDate()))){ |
|
|
|
needpayFront = getNeedPayMoney(wxRentContract,priceArrs[index-1],billTimeVo.getStartDate(),endDate,i,billTimeVoList.size(),saveDb); |
|
|
|
}else{ |
|
|
|
needpayFront = getNeedPayMoney(wxRentContract,priceArrs[index-1],billTimeVo.getStartDate(),endDate,i,billTimeVoList.size(),saveDb); |
|
|
|
needpayAfter = getNeedPayMoney(wxRentContract,priceArrs[index],endDate,billTimeVo.getEndDate(),i,billTimeVoList.size(),saveDb); |
|
|
|
if(billTimeVo.getStartDate().before(endDate)){ |
|
|
|
needpayFront = getNeedPayMoney(wxRentContract, priceArrs[index - 1], billTimeVo.getStartDate(), endDate, i, billTimeVoList.size(), saveDb); |
|
|
|
needpayAfter = getNeedPayMoney(wxRentContract, priceArrs[index], endDate, billTimeVo.getEndDate(), i, billTimeVoList.size(), saveDb); |
|
|
|
}else{ |
|
|
|
needpayFront = getNeedPayMoney(wxRentContract, priceArrs[index], billTimeVo.getStartDate(), billTimeVo.getEndDate(), i, billTimeVoList.size(), saveDb); |
|
|
|
} |
|
|
|
} |
|
|
|
needpay = needpayFront+needpayAfter; |
|
|
|
flag = true; |
|
|
|
|