|
|
|
@@ -2454,7 +2454,7 @@ public class WxRentContractServiceImpl implements WxRentContractService { |
|
|
|
String maxMoney = rj.getMaxMoney();
|
|
|
|
if (StringUtils.isNotBlank(maxMoney)) {
|
|
|
|
if (sales.compareTo(new BigDecimal(maxMoney)) <= 0 ) {
|
|
|
|
revenueDecimal = sales.multiply(new BigDecimal(rj.getRate()));
|
|
|
|
revenueDecimal = sales.multiply(new BigDecimal(rj.getRate())).divide(new BigDecimal(100));
|
|
|
|
if (StringUtils.isNotBlank(rj.getRentMoney())) {
|
|
|
|
rentDecimal = new BigDecimal(rj.getRentMoney());
|
|
|
|
}
|
|
|
|
@@ -2462,7 +2462,7 @@ public class WxRentContractServiceImpl implements WxRentContractService { |
|
|
|
}
|
|
|
|
}else {
|
|
|
|
if (sales.compareTo(new BigDecimal(minMoney)) > 0 ) {
|
|
|
|
revenueDecimal = sales.multiply(new BigDecimal(rj.getRate()));
|
|
|
|
revenueDecimal = sales.multiply(new BigDecimal(rj.getRate())).divide(new BigDecimal(100));
|
|
|
|
if (StringUtils.isNotBlank(rj.getRentMoney())) {
|
|
|
|
rentDecimal = new BigDecimal(rj.getRentMoney());
|
|
|
|
}
|
|
|
|
|