| @@ -199,8 +199,17 @@ public class WxRentContractServiceImpl implements WxRentContractService { | |||||
| BigDecimal price = revenue.multiply(payRatio).setScale(2, RoundingMode.HALF_EVEN); | BigDecimal price = revenue.multiply(payRatio).setScale(2, RoundingMode.HALF_EVEN); | ||||
| record.setPrice(price.multiply(hundred).intValue()); | record.setPrice(price.multiply(hundred).intValue()); | ||||
| } | } | ||||
| record.setPrice(record.getPrice() == null ? 0 : record.getPrice()); | |||||
| record.setDeposit(record.getDeposit() == null ? 0 : record.getDeposit()); | |||||
| if (StringUtils.isNotEmpty(record.getPriceStr())) { | |||||
| record.setPrice(new BigDecimal(record.getPriceStr()).multiply(new BigDecimal(100)).intValue()); | |||||
| } else { | |||||
| record.setPrice(0); | |||||
| } | |||||
| if (StringUtils.isNotEmpty(record.getDepositStr())) { | |||||
| record.setDeposit(new BigDecimal(record.getDepositStr()).multiply(new BigDecimal(100)).intValue()); | |||||
| } else { | |||||
| record.setDeposit(0); | |||||
| } | |||||
| Date date = new Date(); | Date date = new Date(); | ||||
| record.setCreatetime(date); | record.setCreatetime(date); | ||||
| @@ -398,8 +407,16 @@ public class WxRentContractServiceImpl implements WxRentContractService { | |||||
| BigDecimal price = revenue.multiply(payRatio).setScale(2, RoundingMode.HALF_EVEN); | BigDecimal price = revenue.multiply(payRatio).setScale(2, RoundingMode.HALF_EVEN); | ||||
| record.setPrice(price.multiply(hundred).intValue()); | record.setPrice(price.multiply(hundred).intValue()); | ||||
| } | } | ||||
| record.setPrice(record.getPrice() == null ? 0 : record.getPrice()); | |||||
| record.setDeposit(record.getDeposit() == null ? 0 : record.getDeposit()); | |||||
| if (StringUtils.isNotEmpty(record.getPriceStr())) { | |||||
| record.setPrice(new BigDecimal(record.getPriceStr()).multiply(new BigDecimal(100)).intValue()); | |||||
| } else { | |||||
| record.setPrice(0); | |||||
| } | |||||
| if (StringUtils.isNotEmpty(record.getDepositStr())) { | |||||
| record.setDeposit(new BigDecimal(record.getDepositStr()).multiply(new BigDecimal(100)).intValue()); | |||||
| } else { | |||||
| record.setDeposit(0); | |||||
| } | |||||
| record.setUpdatetime(new Date()); | record.setUpdatetime(new Date()); | ||||