|
|
|
@@ -2219,22 +2219,17 @@ public class WxRentContractServiceImpl implements WxRentContractService { |
|
|
|
result.put("reductionEndDateMonth", "/"); |
|
|
|
result.put("reductionEndDateDay", "/"); |
|
|
|
} |
|
|
|
String shopType1 = "□",shopType2 = "□",shopType3 = "□",shopType4 = "□"; |
|
|
|
|
|
|
|
String shopType4Str = ""; |
|
|
|
if(wxRentContract.getShopType() != null && wxRentContract.getShopType().intValue() == 1){ |
|
|
|
shopType1 = "\\u00FE"; |
|
|
|
shopType4Str = "直营"; |
|
|
|
}else if(wxRentContract.getShopType() != null && wxRentContract.getShopType().intValue() == 2){ |
|
|
|
shopType2 = "\\u00FE"; |
|
|
|
shopType4Str = "代理"; |
|
|
|
}else if(wxRentContract.getShopType() != null && wxRentContract.getShopType().intValue() == 3){ |
|
|
|
shopType3 = "\\u00FE"; |
|
|
|
shopType4Str = "加盟"; |
|
|
|
}else{ |
|
|
|
shopType4 = "\\u00FE"; |
|
|
|
shopType4Str = wxRentContract.getShopTypeStr(); |
|
|
|
shopType4Str = "其他("+wxRentContract.getShopTypeStr()+")"; |
|
|
|
} |
|
|
|
result.put("shopType1",shopType1); |
|
|
|
result.put("shopType2",shopType2); |
|
|
|
result.put("shopType3",shopType3); |
|
|
|
result.put("shopType4",shopType4); |
|
|
|
result.put("shopType4Str",shopType4Str); |
|
|
|
|
|
|
|
|
|
|
|
@@ -2329,7 +2324,7 @@ public class WxRentContractServiceImpl implements WxRentContractService { |
|
|
|
result.put("oneRentalStartDateDay2",incrementStartDate.substring(8,10)); |
|
|
|
result.put("oneRentIncreasing2",increasingProportion); |
|
|
|
double priceRent2 = new BigDecimal(priceRent) |
|
|
|
.multiply(new BigDecimal(1).add(new BigDecimal(increasingProportion))) |
|
|
|
.multiply(new BigDecimal(1).add(new BigDecimal(increasingProportion).divide(new BigDecimal(100)))) |
|
|
|
.setScale(2, RoundingMode.HALF_EVEN).doubleValue(); |
|
|
|
result.put("oneRentalPrice2", priceRent2); |
|
|
|
result.put("oneRentalPriceUpper2", PriceUtil.digitUppercase(priceRent2)); |
|
|
|
|