|
|
|
@@ -2045,6 +2045,7 @@ public class WxRentContractServiceImpl implements WxRentContractService { |
|
|
|
} |
|
|
|
//乙方信息 |
|
|
|
result.put("scopeMetre",wxRentContract.getScopeMetre()); |
|
|
|
result.put("shopTypeSub",wxRentContract.getShopTypeSub()); |
|
|
|
result.put("leasePurpose",wxRentContract.getLeasePurpose()); |
|
|
|
result.put("linkPhoneB",wxRentContract.getLinkPhone()); |
|
|
|
result.put("linkAddressB",wxRentContract.getLinkAddress()); |
|
|
|
@@ -2272,7 +2273,10 @@ public class WxRentContractServiceImpl implements WxRentContractService { |
|
|
|
result.put("oneRentalPrice1", priceRent); |
|
|
|
result.put("oneRentalPriceUpper1", PriceUtil.digitUppercase(priceRent)); |
|
|
|
|
|
|
|
result.put("oneRentPrice",wxRentContract.getRentPrice()); |
|
|
|
double oneRentPrice = new BigDecimal(wxRentContract.getRentPrice()) |
|
|
|
.divide(new BigDecimal(100)) |
|
|
|
.setScale(2, RoundingMode.HALF_EVEN).doubleValue(); |
|
|
|
result.put("oneRentPrice",oneRentPrice); |
|
|
|
//稍后详细计算 |
|
|
|
result.put("oneRentalQuarterPrice1", priceRent*3); |
|
|
|
result.put("oneRentalQuarterPriceUpper1", PriceUtil.digitUppercase(priceRent*3)); |
|
|
|
@@ -2336,7 +2340,10 @@ public class WxRentContractServiceImpl implements WxRentContractService { |
|
|
|
result.put("threeRentalPrice1", priceRent); |
|
|
|
result.put("threeRentalPriceUpper1", PriceUtil.digitUppercase(priceRent)); |
|
|
|
|
|
|
|
result.put("threeRentPrice",wxRentContract.getRentPrice()); |
|
|
|
double threeRentPrice = new BigDecimal(wxRentContract.getRentPrice()) |
|
|
|
.divide(new BigDecimal(100)) |
|
|
|
.setScale(2, RoundingMode.HALF_EVEN).doubleValue(); |
|
|
|
result.put("threeRentPrice",threeRentPrice); |
|
|
|
double threePayRatio1 = new BigDecimal(wxRentContract.getPayRatio()) |
|
|
|
.divide(new BigDecimal(100)) |
|
|
|
.setScale(2, RoundingMode.HALF_EVEN).doubleValue(); |
|
|
|
@@ -2359,6 +2366,7 @@ public class WxRentContractServiceImpl implements WxRentContractService { |
|
|
|
result.put("threeProgressivePayUpper2",PriceUtil.digitUppercase(threeProgressivePay2)); |
|
|
|
double threeRentPrice2 = new BigDecimal(wxRentContract.getRentPrice()) |
|
|
|
.multiply(new BigDecimal(1).add(new BigDecimal(progressivePay).divide(new BigDecimal(100)))) |
|
|
|
.divide(new BigDecimal(100)) |
|
|
|
.setScale(2, RoundingMode.HALF_EVEN).doubleValue(); |
|
|
|
result.put("threeRentPrice2",threeRentPrice2); |
|
|
|
result.put("threeRentIncreasing2",increasingProportion); |
|
|
|
|