|
|
|
@@ -2143,8 +2143,8 @@ public class WxRentContractServiceImpl implements WxRentContractService { |
|
|
|
} |
|
|
|
|
|
|
|
//计租 |
|
|
|
if(wxRentContract.getRentalStartDate() != null && wxRentContract.getRentalEndDate() != null){ |
|
|
|
String rentalStartDate = DateUtils.date2String(wxRentContract.getRentalStartDate(), "yyyy-MM-dd"); |
|
|
|
if(wxRentContract.getStartDate() != null && wxRentContract.getRentalEndDate() != null){ |
|
|
|
String rentalStartDate = DateUtils.date2String(wxRentContract.getStartDate(), "yyyy-MM-dd"); |
|
|
|
result.put("rentalStartDate", rentalStartDate); |
|
|
|
result.put("rentalStartDateYear", rentalStartDate.substring(0, 4)); |
|
|
|
result.put("rentalStartDateMonth", rentalStartDate.substring(5, 7)); |
|
|
|
@@ -2158,12 +2158,12 @@ public class WxRentContractServiceImpl implements WxRentContractService { |
|
|
|
//免租 |
|
|
|
if(wxRentContract.getStartDate() != null && wxRentContract.getRentalStartDate()!=null |
|
|
|
&& !DateUtils.isSameDate(wxRentContract.getStartDate(),wxRentContract.getRentalStartDate())){ |
|
|
|
String reductionStartDate = DateUtils.date2String(wxRentContract.getStartDate(), "yyyy-MM-dd"); |
|
|
|
String reductionStartDate = DateUtils.date2String(wxRentContract.getRentalStartDate(), "yyyy-MM-dd"); |
|
|
|
result.put("reductionStartDateYear", reductionStartDate.substring(0, 4)); |
|
|
|
result.put("reductionStartDateMonth", reductionStartDate.substring(5, 7)); |
|
|
|
result.put("reductionStartDateDay", reductionStartDate.substring(8)); |
|
|
|
// String reductionEndDate = DateUtils.date2String(wxRentContract.getRentalStartDate(), "yyyy-MM-dd"); |
|
|
|
String reductionEndDate = DateUtils.getTimeBefore(1,wxRentContract.getRentalStartDate()); |
|
|
|
String reductionEndDate = DateUtils.getTimeBefore(1,wxRentContract.getStartDate()); |
|
|
|
result.put("reductionEndDateYear", reductionEndDate.substring(0, 4)); |
|
|
|
result.put("reductionEndDateMonth", reductionEndDate.substring(5, 7)); |
|
|
|
result.put("reductionEndDateDay", reductionEndDate.substring(8)); |
|
|
|
@@ -2179,9 +2179,9 @@ public class WxRentContractServiceImpl implements WxRentContractService { |
|
|
|
String shopType4Str = ""; |
|
|
|
if(wxRentContract.getShopType() != null && wxRentContract.getShopType().intValue() == 1){ |
|
|
|
shopType4Str = "直营"; |
|
|
|
}else if(wxRentContract.getShopType() != null && wxRentContract.getShopType().intValue() == 2){ |
|
|
|
}else if(wxRentContract.getShopType() != null && wxRentContract.getShopType().intValue() == 6){ |
|
|
|
shopType4Str = "代理"; |
|
|
|
}else if(wxRentContract.getShopType() != null && wxRentContract.getShopType().intValue() == 3){ |
|
|
|
}else if(wxRentContract.getShopType() != null && wxRentContract.getShopType().intValue() == 2){ |
|
|
|
shopType4Str = "加盟"; |
|
|
|
}else{ |
|
|
|
shopType4Str = "其他("+wxRentContract.getShopTypeStr()+")"; |
|
|
|
@@ -2302,8 +2302,9 @@ public class WxRentContractServiceImpl implements WxRentContractService { |
|
|
|
|
|
|
|
|
|
|
|
}else if(EnumRentContractType.RENT_BY_JOINT.getCode().equals(type)){ |
|
|
|
Integer twoPayRatio1 = new BigDecimal(wxRentContract.getPayRatio()) |
|
|
|
.divide(new BigDecimal(100)).intValue(); |
|
|
|
Double twoPayRatio1 = new BigDecimal(wxRentContract.getPayRatio()) |
|
|
|
.divide(new BigDecimal(100)) |
|
|
|
.setScale(2, RoundingMode.HALF_EVEN).doubleValue();; |
|
|
|
result.put("twoPayRatio1",twoPayRatio1); |
|
|
|
result.put("twoPayDate",wxRentContract.getPayDate()); |
|
|
|
if(StringUtils.isNotBlank(incrementStartDate)){ |
|
|
|
@@ -2316,7 +2317,10 @@ public class WxRentContractServiceImpl implements WxRentContractService { |
|
|
|
result.put("twoRentalStartDateMonth2",incrementStartDate.substring(5,7)); |
|
|
|
result.put("twoRentalStartDateDay2",incrementStartDate.substring(8,10)); |
|
|
|
result.put("twoRentIncreasing2",increasingProportion); |
|
|
|
result.put("twoPayRatio2",twoPayRatio1+Integer.parseInt(increasingProportion)); |
|
|
|
Double twoPayRatio2 = new BigDecimal(wxRentContract.getPayRatio()) |
|
|
|
.add(new BigDecimal(increasingProportion)) |
|
|
|
.setScale(2, RoundingMode.HALF_EVEN).doubleValue(); |
|
|
|
result.put("twoPayRatio2",twoPayRatio2); |
|
|
|
|
|
|
|
}else{ |
|
|
|
String rentalEndDate = DateUtils.date2String(wxRentContract.getRentalEndDate(), "yyyy-MM-dd"); |
|
|
|
@@ -2333,8 +2337,9 @@ public class WxRentContractServiceImpl implements WxRentContractService { |
|
|
|
result.put("threeRentalPriceUpper1", PriceUtil.digitUppercase(priceRent)); |
|
|
|
|
|
|
|
result.put("threeRentPrice",wxRentContract.getRentPrice()); |
|
|
|
Integer threePayRatio1 = new BigDecimal(wxRentContract.getPayRatio()) |
|
|
|
.divide(new BigDecimal(100)).intValue(); |
|
|
|
double threePayRatio1 = new BigDecimal(wxRentContract.getPayRatio()) |
|
|
|
.divide(new BigDecimal(100)) |
|
|
|
.setScale(2, RoundingMode.HALF_EVEN).doubleValue(); |
|
|
|
result.put("threePayRatio1",threePayRatio1); |
|
|
|
|
|
|
|
result.put("threePayDate",wxRentContract.getPayDate()); |
|
|
|
|