|
|
@@ -677,13 +677,13 @@ public class WxRentContractServiceImpl implements WxRentContractService { |
|
|
if (StringUtils.isBlank(revenue)) {
|
|
|
if (StringUtils.isBlank(revenue)) {
|
|
|
revenue = "0";
|
|
|
revenue = "0";
|
|
|
}
|
|
|
}
|
|
|
record.setPrice(new BigDecimal(record.getPayRatio()).multiply(new BigDecimal(revenue)).setScale(Constant.default_long_decimal_size,RoundingMode.HALF_UP).toPlainString());
|
|
|
|
|
|
|
|
|
record.setPrice(new BigDecimal(record.getPayRatio()).multiply(new BigDecimal(revenue)).divide(new BigDecimal(100),Constant.default_long_decimal_size,RoundingMode.HALF_UP).toPlainString());
|
|
|
}else if (record.getType().equals(EnumRentContractType.RENT_BY_AREA_AND_JOINT.getCode())) {
|
|
|
}else if (record.getType().equals(EnumRentContractType.RENT_BY_AREA_AND_JOINT.getCode())) {
|
|
|
String revenue = record.getRevenue();
|
|
|
String revenue = record.getRevenue();
|
|
|
if (StringUtils.isBlank(revenue)) {
|
|
|
if (StringUtils.isBlank(revenue)) {
|
|
|
revenue = "0";
|
|
|
revenue = "0";
|
|
|
}
|
|
|
}
|
|
|
BigDecimal renevuePrice = new BigDecimal(record.getPayRatio()).multiply(new BigDecimal(revenue));
|
|
|
|
|
|
|
|
|
BigDecimal renevuePrice = new BigDecimal(record.getPayRatio()).multiply(new BigDecimal(revenue)).divide(new BigDecimal(100),Constant.default_long_decimal_size,RoundingMode.HALF_UP);
|
|
|
BigDecimal rentPrice = null;
|
|
|
BigDecimal rentPrice = null;
|
|
|
//联营取高,如果是固定金额的话,取固定金额. 不固定的金额,会传price.
|
|
|
//联营取高,如果是固定金额的话,取固定金额. 不固定的金额,会传price.
|
|
|
if (null != record.getRevenueFixedRentPrice() && record.getRevenueFixedRentPrice().intValue() == EnumYesOrNo.YES.getCode()){
|
|
|
if (null != record.getRevenueFixedRentPrice() && record.getRevenueFixedRentPrice().intValue() == EnumYesOrNo.YES.getCode()){
|
|
|
|