|
|
@ -2829,7 +2829,7 @@ public class LoanSettleApplyService extends MybatisBaseService<LoanSettleApplyMa |
|
|
|
String settingDate = loanSettleApply.getSettingDate(); |
|
|
|
String formatDate = DateUtil.formatDate(new Date()); |
|
|
|
boolean settle = isSettle(loanSettleApply); |
|
|
|
if (!settle) { |
|
|
|
if (settle) { |
|
|
|
return rb.setMsg("结清款尚未认款完毕,请继续认款!"); |
|
|
|
} |
|
|
|
if (formatDate.compareTo(settingDate) > 0) { |
|
|
@ -2850,7 +2850,7 @@ public class LoanSettleApplyService extends MybatisBaseService<LoanSettleApplyMa |
|
|
|
} |
|
|
|
|
|
|
|
public boolean isSettle(LoanSettleApply loanSettleApply) { |
|
|
|
boolean isSettle = true; |
|
|
|
boolean isSettle = false; |
|
|
|
String busVinSid = loanSettleApply.getBusVinSid(); |
|
|
|
BigDecimal sumMoney = BigDecimal.ZERO; |
|
|
|
BigDecimal dueMoney = BigDecimal.ZERO; //月还
|
|
|
@ -2859,9 +2859,13 @@ public class LoanSettleApplyService extends MybatisBaseService<LoanSettleApplyMa |
|
|
|
Date closeDate = loanSettleApply.getCloseDate(); |
|
|
|
String formatDate = sdf.format(closeDate); |
|
|
|
String jMoney = baseMapper.selJrMoneyByBusVinSidAndCloseDate(busVinSid, formatDate); |
|
|
|
jrMoney = new BigDecimal(jMoney); |
|
|
|
if (StringUtils.isNotBlank(jMoney)) { |
|
|
|
jrMoney = new BigDecimal(jMoney); |
|
|
|
} |
|
|
|
String dMoney = baseMapper.selDueMoneyByBusVinSidAndCloseDate(busVinSid, formatDate); |
|
|
|
dueMoney = new BigDecimal(dMoney); |
|
|
|
if (StringUtils.isNotBlank(dMoney)) { |
|
|
|
dueMoney = new BigDecimal(dMoney); |
|
|
|
} |
|
|
|
sumMoney = jrMoney.add(dueMoney); |
|
|
|
//获取公司减免情况
|
|
|
|
BigDecimal amountTo = BigDecimal.ZERO; |
|
|
@ -2881,7 +2885,7 @@ public class LoanSettleApplyService extends MybatisBaseService<LoanSettleApplyMa |
|
|
|
} |
|
|
|
} |
|
|
|
if (sumMoney.compareTo(amountTo) < 0) { |
|
|
|
isSettle = false; |
|
|
|
isSettle = true; |
|
|
|
} |
|
|
|
return isSettle; |
|
|
|
} |
|
|
|